diff --git a/HDF5Examples/C/H5D/test.sh.in b/HDF5Examples/C/H5D/test.sh.in
index 0542bad227e..64ed41e7710 100755
--- a/HDF5Examples/C/H5D/test.sh.in
+++ b/HDF5Examples/C/H5D/test.sh.in
@@ -115,8 +115,8 @@ else
   version_compare "$H5_LIBVER" "1.10.8"
   if [ "$version_lt" = 1 ]; then
     USE_ALT="07"
+    nbitdir="110"
   fi
-  nbitdir="110"
 fi
 
 for topic in $topics18
@@ -130,7 +130,7 @@ do
         echo "  Unsupported feature"
         status=0
     else
-        if [[ $fname == "h5ex_d_nbit"]]
+        if [[ $fname == "h5ex_d_nbit" ]]
         then
             tdir=$nbitdir
             if [[ $USE_ALT == "" ]]
diff --git a/HDF5Examples/C/H5G/test.sh.in b/HDF5Examples/C/H5G/test.sh.in
index 609590cc736..f12c4a507c1 100755
--- a/HDF5Examples/C/H5G/test.sh.in
+++ b/HDF5Examples/C/H5G/test.sh.in
@@ -50,7 +50,7 @@ $ECHO_N "Testing C/H5G/h5ex_g_create...$ECHO_C"
 ./h5ex_g_create
 dumpout h5ex_g_create.h5 >tmp.test
 rm -f h5ex_g_create.h5
-cmp -s tmp.test $srcdir/tfiles/18/h5ex_g_create.ddl
+cmp -s tmp.test $srcdir/tfiles/16/h5ex_g_create.ddl
 status=$?
 if test $status -ne 0
 then
@@ -70,7 +70,7 @@ else
     exout ./h5ex_g_iterate >tmp.test
     rm  -f h5ex_g_iterate.h5
 fi
-cmp -s tmp.test $srcdir/tfiles/18/h5ex_g_iterate.tst
+cmp -s tmp.test $srcdir/tfiles/16/h5ex_g_iterate.tst
 status=$?
 if test $status -ne 0
 then
@@ -90,7 +90,7 @@ else
     exout ./h5ex_g_traverse >tmp.test
     rm  -f h5ex_g_traverse.h5
 fi
-cmp -s tmp.test $srcdir/tfiles/18/h5ex_g_traverse.tst
+cmp -s tmp.test $srcdir/tfiles/16/h5ex_g_traverse.tst
 status=$?
 if test $status -ne 0
 then
diff --git a/HDF5Examples/C/H5T/test.sh.in b/HDF5Examples/C/H5T/test.sh.in
index 2f081a58bf8..24bc30138e0 100755
--- a/HDF5Examples/C/H5T/test.sh.in
+++ b/HDF5Examples/C/H5T/test.sh.in
@@ -69,16 +69,22 @@ do
     then
         echo "  FAILED!"
     else
-        dumpout $fname.h5 >tmp.test
-      rm -f $fname.h5
-      cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
-      status=$?
-      if test $status -ne 0
-      then
-          echo "  FAILED!"
-      else
-          echo "  Passed"
-      fi
+        if [[ $fname == "h5ex_t_cpxcmpd" || $fname == "h5ex_t_cpxcmpdatt" ]]
+        then
+            targ="-n"
+        else
+            targ=""
+        fi
+        dumpout $targ $fname.h5 >tmp.test
+        rm -f $fname.h5
+        cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
+        status=$?
+        if test $status -ne 0
+        then
+            echo "  FAILED!"
+        else
+            echo "  Passed"
+        fi
     fi
     return_val=`expr $status + $return_val`
 done
@@ -87,13 +93,7 @@ done
 #######Non-standard tests#######
 
 USE_ALT=""
-if [ "$H5_LIBVER_DIR" = "114" ]; then
-   # check if HDF5 version is < 1.14.3
-   version_compare "$H5_LIBVER" "1.10.3"
-   if [ "$version_lt" = 1 ]; then
-      USE_ALT="02"
-   fi
-elif [ "$H5_LIBVER_DIR" = "110" ]; then
+if [ "$H5_LIBVER_DIR" = "110" ]; then
    # check if HDF5 version is < 1.10.7
    version_compare "$H5_LIBVER" "1.10.7"
    if [ "$version_lt" = 1 ]; then
@@ -159,13 +159,14 @@ do
     then
         echo "  FAILED!"
     else
-        dumpout -n $fname.h5 >tmp.test
+        dumpout $fname.h5 >tmp.test
         rm -f $fname.h5
-        version_compare "$H5_LIBVER" "1.14.0"
+        version_compare "$H5_LIBVER" "1.14.3"
         if [ "$version_lt" = 1 ]; then
             cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
         else
-            cmp -s tmp.test $srcdir/tfiles/114/$fname$USE_ALT.ddl
+            cmp -s tmp.test $srcdir/tfiles/114/$fname.ddl
+        fi
         status=$?
         if test $status -ne 0
         then
diff --git a/HDF5Examples/C/H5T/tfiles/114/h5ex_t_vlen02.ddl b/HDF5Examples/C/H5T/tfiles/114/h5ex_t_vlen02.ddl
deleted file mode 100644
index 53f48630b19..00000000000
--- a/HDF5Examples/C/H5T/tfiles/114/h5ex_t_vlen02.ddl
+++ /dev/null
@@ -1,11 +0,0 @@
-HDF5 "h5ex_t_vlen.h5" {
-GROUP "/" {
-   DATASET "DS1" {
-      DATATYPE  H5T_VLEN { H5T_STD_I32LE}
-      DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
-      DATA {
-      (0): (3, 2, 1), (1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144)
-      }
-   }
-}
-}
diff --git a/HDF5Examples/C/H5T/tfiles/114/h5ex_t_vlenatt02.ddl b/HDF5Examples/C/H5T/tfiles/114/h5ex_t_vlenatt02.ddl
deleted file mode 100644
index a2b32e878cb..00000000000
--- a/HDF5Examples/C/H5T/tfiles/114/h5ex_t_vlenatt02.ddl
+++ /dev/null
@@ -1,17 +0,0 @@
-HDF5 "h5ex_t_vlenatt.h5" {
-GROUP "/" {
-   DATASET "DS1" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  NULL
-      DATA {
-      }
-      ATTRIBUTE "A1" {
-         DATATYPE  H5T_VLEN { H5T_STD_I32LE}
-         DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
-         DATA {
-         (0): (3, 2, 1), (1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144)
-         }
-      }
-   }
-}
-}
diff --git a/HDF5Examples/FORTRAN/H5D/test.sh.in b/HDF5Examples/FORTRAN/H5D/test.sh.in
index 24c670fd1c4..5a79e86b661 100755
--- a/HDF5Examples/FORTRAN/H5D/test.sh.in
+++ b/HDF5Examples/FORTRAN/H5D/test.sh.in
@@ -113,9 +113,9 @@ do
           cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
           status=$?
           if test $status -ne 0
-             then 
-	     # test to see if the only difference is because of big-endian and little-endian
-	     \diff tmp.test $srcdir/tfiles/18/$fname.ddl > tmp.diff
+          then 
+             # test to see if the only difference is because of big-endian and little-endian
+             diff tmp.test $srcdir/tfiles/18/$fname.ddl > tmp.diff
              echo " "
              NumOfFinds=`grep -c "DATATYPE" tmp.diff`
              NumOfFinds=`expr $NumOfFinds \* 2`
@@ -137,80 +137,72 @@ done
 
 #######Non-standard tests#######
 USE_ALT=""
+### Set default tfiles directory for tests
+nbitdir="18"
 version_compare "$H5_LIBVER" "1.8.23"
 # check if HDF5 version is < 1.8.23
 if [ "$version_lt" = 1 ]; then
     USE_ALT="22"
-    nbitdir="18"
 else
 # check if HDF5 version is < 1.10.8
   version_compare "$H5_LIBVER" "1.10.8"
   if [ "$version_lt" = 1 ]; then
     USE_ALT="07"
+    nbitdir="110"
   fi
-  nbitdir="110"
 fi
 
-fname=h5ex_d_nbit
-$ECHO_N "Testing FORTRAN/H5D/$fname...$ECHO_C"
-exout ./$fname >tmp.test
-status=$?
-if test $status -eq 1
-then
-    echo "  Unsupported feature"
-else
-    cmp -s tmp.test $srcdir/tfiles/18/$fname.tst
+topics="nbit"
+for topic in $topics18
+do
+    fname=h5ex_d_$topic
+    $ECHO_N "Testing C/H5D/$fname...$ECHO_C"
+    exout ./$fname >tmp.test
     status=$?
-    if test $status -ne 0
+    if test $status -eq 1
     then
-        echo "  FAILED!"
+        echo "  Unsupported feature"
+        status=0
     else
-        dumpout $fname.h5 >tmp.test
-        rm -f $fname.h5
-        cmp -s tmp.test $srcdir/tfiles/$nbitdir/$fname$USE_ALT.ddl
-        status=$?
-        if test $status -ne 0
+        if [[ $fname == "h5ex_d_nbit" ]]
         then
-            echo "  FAILED!"
+            tdir=$nbitdir
+            if [[ $USE_ALT == "" ]]
+            then
+                ### set USE_ALT=07 if not set above
+                USE_ALT="07"
+            fi
         else
-            echo "  Passed"
+            tdir=18
+            ### unset USE_ALT for the other topics
+            USE_ALT=""
         fi
-        return_val=`expr $status + $return_val`
-    fi
-    return_val=`expr $status + $return_val`
-fi
-
-#Remove external data file from h5ex_d_extern
-rm -f h5ex_d_extern.data
-
-
-fname=h5ex_d_transform
-$ECHO_N "Testing FORTRAN/H5D/$fname...$ECHO_C"
-exout ./$fname >tmp.test
-status=$?
-if test $status -eq 1
-then
-    echo "  Unsupported feature"
-else
-    cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.tst
-    status=$?
-    if test $status -ne 0
-    then
-        echo "  FAILED!"
-    else
-        dumpout -n $fname.h5 >tmp.test
-        rm -f $fname.h5
-        cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname$USE_ALT.ddl
+        cmp -s tmp.test $srcdir/tfiles/18/$fname.tst
         status=$?
         if test $status -ne 0
         then
             echo "  FAILED!"
         else
-            echo "  Passed"
+          if [[ $fname == "h5ex_d_transform" ]]
+          then
+              targ="-n"
+          else
+              targ=""
+          fi
+          dumpout $targ $fname.h5 >tmp.test
+          rm -f $fname.h5
+          cmp -s tmp.test $srcdir/tfiles/$tdir/$fname$USE_ALT.ddl
+          status=$?
+          if test $status -ne 0
+          then
+              echo "  FAILED!"
+          else
+              echo "  Passed"
+          fi
         fi
+        return_val=`expr $status + $return_val`
     fi
-    return_val=`expr $status + $return_val`
-fi
+done
 
 
 rm -f tmp.test
diff --git a/HDF5Examples/FORTRAN/H5T/test.sh.in b/HDF5Examples/FORTRAN/H5T/test.sh.in
index 4af35bf9650..e25f40896aa 100755
--- a/HDF5Examples/FORTRAN/H5T/test.sh.in
+++ b/HDF5Examples/FORTRAN/H5T/test.sh.in
@@ -59,7 +59,7 @@ if [ "$FORTRAN_2003_CONDITIONAL_F" = "Xyes" ]; then
     topics="arrayatt_F03 array_F03 bitatt_F03 bit_F03 cmpdatt_F03 cmpd_F03 \
             Cstring_F03 enumatt_F03 enum_F03 floatatt_F03 float_F03 \
             intatt_F03 int_F03 opaqueatt_F03 opaque_F03 \
-            string_F03 vlenatt_F03 vlen_F03 $topics"
+            string_F03 $topics"
 fi
 
 return_val=0
@@ -75,16 +75,22 @@ do
     then
         echo "  FAILED!"
     else
-        dumpout $fname.h5 >tmp.test
-      rm -f $fname.h5
-      cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
-      status=$?
-      if test $status -ne 0
-      then
-          echo "  FAILED!"
-      else
-          echo "  Passed"
-      fi
+        if [[ $fname == "h5ex_t_cpxcmpd_F03" || $fname == "h5ex_t_cpxcmpdatt_F03" ]]
+        then
+            targ="-n"
+        else
+            targ=""
+        fi
+        dumpout $targ $fname.h5 >tmp.test
+        rm -f $fname.h5
+        cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
+        status=$?
+        if test $status -ne 0
+        then
+            echo "  FAILED!"
+        else
+            echo "  Passed"
+        fi
     fi
     return_val=`expr $status + $return_val`
 done
@@ -93,13 +99,7 @@ done
 #######Non-standard tests#######
 
 USE_ALT=""
-if [ "$H5_LIBVER_DIR" = "114" ]; then
-   # check if HDF5 version is < 1.14.3
-   version_compare "$H5_LIBVER" "1.10.3"
-   if [ "$version_lt" = 1 ]; then
-      USE_ALT="02"
-   fi
-elif [ "$H5_LIBVER_DIR" = "110" ]; then
+if [ "$H5_LIBVER_DIR" = "110" ]; then
    # check if HDF5 version is < 1.10.7
    version_compare "$H5_LIBVER" "1.10.7"
    if [ "$version_lt" = 1 ]; then
@@ -156,56 +156,43 @@ do
     return_val=`expr $status + $return_val`
 done
 
-#fname=h5ex_t_cpxcmpd
-#$ECHO_N "Testing FORTRAN/H5T/$fname...$ECHO_C"
-#exout ./$fname >tmp.test
-#cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.tst
-#status=$?
-#if test $status -ne 0
-#then
-#    echo "  FAILED!"
-#else
-#  dumpout -n $fname.h5 >tmp.test
-#rm -f $fname.h5
-#  cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.ddl
-#status=$?
-#if test $status -ne 0
-#then
-#    echo "  FAILED!"
-#else
-#    echo "  Passed"
-#fi
-#fi
-#return_val=`expr $status + $return_val`
-
+topics=" vlenatt_F03 vlen_F03"
 
-#fname=h5ex_t_cpxcmpdatt
-#$ECHO_N "Testing FORTRAN/H5T/$fname...$ECHO_C"
-#exout ./$fname >tmp.test
-#cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.tst
-#status=$?
-#if test $status -ne 0
-#then
-#    echo "  FAILED!"
-#else
-#  dumpout -n $fname.h5 >tmp.test
-#rm -f $fname.h5
-#  cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.ddl
-#status=$?
-#if test $status -ne 0
-#then
-#    echo "  FAILED!"
-#else
-#    echo "  Passed"
-#fi
-#fi
-#return_val=`expr $status + $return_val`
+for topic in $topics
+do
+    fname=h5ex_t_$topic
+    $ECHO_N "Testing C/H5T/$fname...$ECHO_C"
+    exout ./$fname >tmp.test
+    cmp -s tmp.test $srcdir/tfiles/18/$fname.tst
+    status=$?
+    if test $status -ne 0
+    then
+        echo "  FAILED!"
+    else
+        dumpout $fname.h5 >tmp.test
+        rm -f $fname.h5
+        version_compare "$H5_LIBVER" "1.14.3"
+        if [ "$version_lt" = 1 ]; then
+            cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
+        else
+            cmp -s tmp.test $srcdir/tfiles/114/$fname.ddl
+        fi
+        status=$?
+        if test $status -ne 0
+        then
+            echo "  FAILED!"
+        else
+            echo "  Passed"
+        fi
+    fi
+    return_val=`expr $status + $return_val`
+done
 
 
 #fname=h5ex_t_convert
 #$ECHO_N "Testing FORTRAN/H5T/$fname...$ECHO_C"
 #exout ./$fname >tmp.test
-#cmp -s tmp.test $srcdir/tfiles/$H5_LIBVER_DIR/$fname.test
+#cmp -s tmp.test $srcdir/tfiles/18/$fname.test
 #status=$?
 #if test $status -ne 0
 #then
diff --git a/HDF5Examples/JAVA/H5D/CMakeLists.txt b/HDF5Examples/JAVA/H5D/CMakeLists.txt
index 44728148a9b..60c35dc8f72 100644
--- a/HDF5Examples/JAVA/H5D/CMakeLists.txt
+++ b/HDF5Examples/JAVA/H5D/CMakeLists.txt
@@ -51,8 +51,8 @@ if (H5EX_BUILD_TESTING)
             -D "TEST_ARGS:STRING=${ARGN}"
             -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${EXAMPLE_VARNAME}_${resultfile}_JAR_FILE}"
             -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
-            -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_H5D_BINARY_DIR}"
-            -D "TEST_OUTPUT=${HDFJAVA_EXAMPLES_H5D_BINARY_DIR}/${resultfile}.out"
+            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+            -D "TEST_OUTPUT=${PROJECT_BINARY_DIR}/${resultfile}.out"
             -D "TEST_REFERENCE=${resultfile}.txt"
             -D "TEST_EXPECT=${resultcode}"
             -D "TEST_SKIP_COMPARE=TRUE"
@@ -70,7 +70,7 @@ if (H5EX_BUILD_TESTING)
         NAME ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-clearall-objects
         COMMAND    ${CMAKE_COMMAND}
             -E remove
-            ${HDFJAVA_EXAMPLES_H5D_BINARY_DIR}/${example_name}.h5
+            ${PROJECT_BINARY_DIR}/${example_name}.h5
             ${example_name}.out
             ${example_name}.out.err
     )
@@ -81,8 +81,8 @@ if (H5EX_BUILD_TESTING)
         NAME ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects
         COMMAND    ${CMAKE_COMMAND}
             -E copy_if_different
-            ${HDFJAVA_EXAMPLES_H5D_SOURCE_DIR}/tfiles/110/${example_name}.txt
-            ${HDFJAVA_EXAMPLES_H5D_BINARY_DIR}/${example_name}.txt
+            ${PROJECT_SOURCE_DIR}/tfiles/110/${example_name}.txt
+            ${PROJECT_BINARY_DIR}/${example_name}.txt
     )
     set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-clearall-objects)
     set (last_test "${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects")
diff --git a/HDF5Examples/JAVA/H5G/CMakeLists.txt b/HDF5Examples/JAVA/H5G/CMakeLists.txt
index 3da6b8e98ed..5f47d592fd4 100644
--- a/HDF5Examples/JAVA/H5G/CMakeLists.txt
+++ b/HDF5Examples/JAVA/H5G/CMakeLists.txt
@@ -51,8 +51,8 @@ if (H5EX_BUILD_TESTING)
             -D "TEST_ARGS:STRING=${ARGN}"
             -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${EXAMPLE_VARNAME}_${resultfile}_JAR_FILE}"
             -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
-            -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_GROUPS_BINARY_DIR}"
-            -D "TEST_OUTPUT=${HDFJAVA_EXAMPLES_GROUPS_BINARY_DIR}/${resultfile}.out"
+            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+            -D "TEST_OUTPUT=${PROJECT_BINARY_DIR}/${resultfile}.out"
             -D "TEST_REFERENCE=${resultfile}.txt"
             -D "TEST_EXPECT=${resultcode}"
             -D "TEST_SKIP_COMPARE=TRUE"
@@ -70,7 +70,7 @@ if (H5EX_BUILD_TESTING)
         NAME ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-clearall-objects
         COMMAND    ${CMAKE_COMMAND}
             -E remove
-            ${HDFJAVA_EXAMPLES_GROUPS_BINARY_DIR}/${example_name}.h5
+            ${PROJECT_BINARY_DIR}/${example_name}.h5
             ${example_name}.out
             ${example_name}.out.err
     )
@@ -81,8 +81,8 @@ if (H5EX_BUILD_TESTING)
         NAME ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects
         COMMAND    ${CMAKE_COMMAND}
             -E copy_if_different
-            ${HDFJAVA_EXAMPLES_GROUPS_SOURCE_DIR}/tfiles/110/${example_name}.txt
-            ${HDFJAVA_EXAMPLES_GROUPS_BINARY_DIR}/${example_name}.txt
+            ${PROJECT_SOURCE_DIR}/tfiles/110/${example_name}.txt
+            ${PROJECT_BINARY_DIR}/${example_name}.txt
     )
     set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-clearall-objects)
     set (last_test "${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects")
diff --git a/HDF5Examples/JAVA/H5J/CMakeLists.txt b/HDF5Examples/JAVA/H5J/CMakeLists.txt
index b9c7ec519fd..8f1c195fb56 100644
--- a/HDF5Examples/JAVA/H5J/CMakeLists.txt
+++ b/HDF5Examples/JAVA/H5J/CMakeLists.txt
@@ -51,8 +51,8 @@ if (H5EX_BUILD_TESTING)
             -D "TEST_ARGS:STRING=${ARGN}"
             -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${EXAMPLE_VARNAME}_${resultfile}_JAR_FILE}"
             -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
-            -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_INTRO_BINARY_DIR}"
-            -D "TEST_OUTPUT=${HDFJAVA_EXAMPLES_INTRO_BINARY_DIR}/${resultfile}.out"
+            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+            -D "TEST_OUTPUT=${PROJECT_BINARY_DIR}/${resultfile}.out"
             -D "TEST_REFERENCE=${resultfile}.txt"
             -D "TEST_EXPECT=${resultcode}"
             -D "TEST_SKIP_COMPARE=TRUE"
@@ -81,8 +81,8 @@ if (H5EX_BUILD_TESTING)
         NAME ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects
         COMMAND    ${CMAKE_COMMAND}
             -E copy_if_different
-            ${HDFJAVA_EXAMPLES_INTRO_SOURCE_DIR}/tfiles/110/${example_name}.txt
-            ${HDFJAVA_EXAMPLES_INTRO_BINARY_DIR}/${example_name}.txt
+            ${PROJECT_SOURCE_DIR}/tfiles/110/${example_name}.txt
+            ${PROJECT_BINARY_DIR}/${example_name}.txt
     )
     set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-clearall-objects)
     set (last_test "${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects")
diff --git a/HDF5Examples/JAVA/H5T/CMakeLists.txt b/HDF5Examples/JAVA/H5T/CMakeLists.txt
index ce47104b2ec..a779a539d8c 100644
--- a/HDF5Examples/JAVA/H5T/CMakeLists.txt
+++ b/HDF5Examples/JAVA/H5T/CMakeLists.txt
@@ -51,8 +51,8 @@ if (H5EX_BUILD_TESTING)
             -D "TEST_ARGS:STRING=${ARGN}"
             -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${EXAMPLE_VARNAME}_${resultfile}_JAR_FILE}"
             -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_LIB_DIRECTORY}"
-            -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_DATATYPES_BINARY_DIR}"
-            -D "TEST_OUTPUT=${HDFJAVA_EXAMPLES_DATATYPES_BINARY_DIR}/${resultfile}.out"
+            -D "TEST_FOLDER=${PROJECT_BINARY_DIR}"
+            -D "TEST_OUTPUT=${PROJECT_BINARY_DIR}/${resultfile}.out"
             -D "TEST_REFERENCE=${resultfile}.txt"
             -D "TEST_EXPECT=${resultcode}"
             -D "TEST_SKIP_COMPARE=TRUE"
@@ -70,7 +70,7 @@ if (H5EX_BUILD_TESTING)
         NAME ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-clearall-objects
         COMMAND    ${CMAKE_COMMAND}
             -E remove
-            ${HDFJAVA_EXAMPLES_DATATYPES_BINARY_DIR}/${example_name}.h5
+            ${PROJECT_BINARY_DIR}/${example_name}.h5
             ${example_name}.out
             ${example_name}.out.err
     )
@@ -81,8 +81,8 @@ if (H5EX_BUILD_TESTING)
         NAME ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects
         COMMAND    ${CMAKE_COMMAND}
             -E copy_if_different
-            ${HDFJAVA_EXAMPLES_DATATYPES_SOURCE_DIR}/tfiles/110/${example_name}.txt
-            ${HDFJAVA_EXAMPLES_DATATYPES_BINARY_DIR}/${example_name}.txt
+            ${PROJECT_SOURCE_DIR}/tfiles/110/${example_name}.txt
+            ${PROJECT_BINARY_DIR}/${example_name}.txt
     )
     set_tests_properties (${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects PROPERTIES DEPENDS ${EXAMPLE_VARNAME}_jnative-h5-${example_name}-clearall-objects)
     set (last_test "${EXAMPLE_VARNAME}_jnative-h5-${example_name}-copy-objects")