diff --git a/cmake/run_test.sh b/cmake/run_test.sh
index 40c53bd552567aa01079c942e21d85eab10fd983..8a61bee4db8db6ab2fb207a5318b5a361055e219 100755
--- a/cmake/run_test.sh
+++ b/cmake/run_test.sh
@@ -21,7 +21,6 @@ for i in "$@" ; do
     fi
 done
 
-export DYLD_LIBRARY_PATH=$DD4HEP_LIBRARY_PATH
 echo " #### LD_LIBRARY_PATH = :  ${LD_LIBRARY_PATH}"
 echo " #### DYLD_LIBRARY_PATH = :  ${DYLD_LIBRARY_PATH}"
 
diff --git a/cmake/run_test_package.sh b/cmake/run_test_package.sh
index 48b1d9d200cb97a1f5c2eec62d19017dd258947c..18cf2aae75ce580a24e6a2787c3b6d4a531f0af3 100755
--- a/cmake/run_test_package.sh
+++ b/cmake/run_test_package.sh
@@ -20,7 +20,6 @@ for i in "$@" ; do
     fi
 done
 
-export DYLD_LIBRARY_PATH=$DD4HEP_LIBRARY_PATH
 echo " #### LD_LIBRARY_PATH = :  ${LD_LIBRARY_PATH}"
 echo " #### DYLD_LIBRARY_PATH = :  ${DYLD_LIBRARY_PATH}"
 
diff --git a/cmake/thisdd4hep.sh b/cmake/thisdd4hep.sh
index b3c4fc499701f56d554c8761e583e437db1c37f7..e8dca65a9d0a3f5fa5c5074fe2ea3acbac93da19 100644
--- a/cmake/thisdd4hep.sh
+++ b/cmake/thisdd4hep.sh
@@ -43,13 +43,15 @@ dd4hep_add_path()   {
 #-----------------------------------------------------------------------------
 dd4hep_add_library_path()    {
     path_prefix=${1};
-    if [ @USE_DYLD@ ];
+    if [ @APPLE@ ];
     then
         if [ ${DYLD_LIBRARY_PATH} ]; then
             export DYLD_LIBRARY_PATH=${path_prefix}:$DYLD_LIBRARY_PATH;
+            export LD_LIBRARY_PATH=${path_prefix}:$LD_LIBRARY_PATH;
             export DD4HEP_LIBRARY_PATH=${path_prefix}:$DD4HEP_LIBRARY_PATH;
         else
             export DYLD_LIBRARY_PATH=${path_prefix};
+            export LD_LIBRARY_PATH=${path_prefix};
             export DD4HEP_LIBRARY_PATH=${path_prefix};
         fi;
     else
diff --git a/cmake/thisdd4hep_package.sh.in b/cmake/thisdd4hep_package.sh.in
index 65adfbd59221b6a1fcac3d1b9b43822d4bbbd36f..4e2ddead502b028aa811b04dcb2613ca15a7328c 100644
--- a/cmake/thisdd4hep_package.sh.in
+++ b/cmake/thisdd4hep_package.sh.in
@@ -1,4 +1,3 @@
-#!/bin/bash
 #################################################################################
 #
 #  Environment script for DD4hep examples - initializes DD4hep (and ROOT)
@@ -17,7 +16,12 @@ if [ @CLHEP_DIR@ ]; then
 fi;
 source ${DD4hep_DIR}/bin/thisdd4hep.sh;
 #
-dd4hep_parse_this ${BASH_ARGV[0]} @PackageName@;
+SOURCE=${BASH_ARGV[0]}
+if [ "x$SOURCE" = "x" ]; then
+    SOURCE=${(%):-%N} # for zsh
+fi
+
+dd4hep_parse_this $SOURCE;
 #
 #----PATH---------------------------------------------------------------------
 dd4hep_add_path    PATH ${THIS}/bin;