diff --git a/nc_test4/CMakeLists.txt b/nc_test4/CMakeLists.txt
index 8d8565c12..8d57870e8 100644
--- a/nc_test4/CMakeLists.txt
+++ b/nc_test4/CMakeLists.txt
@@ -20,6 +20,7 @@ ENDIF()
 
 # If the v2 API was built, add the test program.
 IF(ENABLE_V2_API)
+
   build_bin_test(tst_v2)
 ENDIF()
 
@@ -30,14 +31,6 @@ ENDIF()
 
 IF(USE_HDF4)
   SET(NC4_TESTS ${NC4_TESTS} tst_interops2)
-
-  IF(USE_HDF4_FILE_TESTS AND NOT MSVC)
-    add_sh_test(nc_test4 run_get_hdf4_files)
-    add_bin_test(nc_test4 tst_interops3)
-    add_sh_test(nc_test4 tst_formatx_hdf4)
-    build_bin_test(tst_chunk_hdf4)
-    add_sh_test(nc_test4 run_chunk_hdf4)
-  ENDIF()
 ENDIF()
 
 IF(BUILD_BENCHMARKS)
@@ -66,6 +59,17 @@ FOREACH(CTEST ${NC4_TESTS})
   add_bin_test(nc_test4 ${CTEST})
 ENDFOREACH()
 
+# This must go after the 'foreach' stanza
+# immediately above this comment.
+IF(USE_HDF4_FILE_TESTS AND NOT MSVC)
+    add_sh_test(nc_test4 run_get_hdf4_files)
+    add_bin_test(nc_test4 tst_interops3)
+    add_sh_test(nc_test4 tst_formatx_hdf4)
+    build_bin_test(tst_chunk_hdf4)
+    add_sh_test(nc_test4 run_chunk_hdf4)
+ENDIF()
+
+
 IF(TEST_PARALLEL)
   build_bin_test(tst_mpi_parallel)
   build_bin_test(tst_parallel)