diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt
index 3de5beb5f3..c9213eeaf7 100644
--- a/ncdump/CMakeLists.txt
+++ b/ncdump/CMakeLists.txt
@@ -197,7 +197,14 @@ ENDIF()
       add_sh_test(ncdump tst_netcdf4_4)
     ENDIF()
 
-
+    ###
+    # Some test reordering was required to ensure these tests
+    # only ran after ncdump was built.
+    ###
+    add_sh_test(ncdump run_ncgen_tests)
+    IF(USE_NETCDF4)
+      add_sh_test(ncdump run_ncgen_nc4_tests)
+    ENDIF()
 
     IF(NOT MSVC)
       add_sh_test(ncdump tst_nccopy4)
diff --git a/ncdump/Makefile.am b/ncdump/Makefile.am
index dee4c2b51b..80215d2666 100644
--- a/ncdump/Makefile.am
+++ b/ncdump/Makefile.am
@@ -44,11 +44,11 @@ check_PROGRAMS = rewrite-scalar ctest ctest64 ncdump tst_utf8 bom tst_dimsizes n
 TESTS = tst_inttags.sh run_tests.sh tst_64bit.sh ctest ctest64 tst_output.sh	\
 tst_lengths.sh tst_calendars.sh tst_utf8 run_utf8_tests.sh      \
 tst_nccopy3.sh tst_charfill.sh tst_iter.sh tst_formatx3.sh tst_bom.sh \
-tst_dimsizes.sh
+tst_dimsizes.sh run_ncgen_tests.sh
 
 if USE_NETCDF4
 check_PROGRAMS += tst_fileinfo
-TESTS += tst_fileinfo.sh
+TESTS += tst_fileinfo.sh run_ncgen_nc4_tests.sh
 endif
 
 if LARGE_FILE_TESTS
@@ -163,7 +163,8 @@ run_utf8_nc4_tests.sh							\
 tst_formatx3.sh tst_formatx4.sh ref_tst_utf8_4.cdl                      \
 tst_inttags.sh tst_inttags4.sh                                          \
 CMakeLists.txt XGetopt.c tst_bom.sh tst_inmemory_nc3.sh                 \
-tst_dimsizes.sh tst_inmemory_nc4.sh tst_fileinfo.sh
+tst_dimsizes.sh tst_inmemory_nc4.sh tst_fileinfo.sh run_ncgen_tests.sh  \
+run_ncgen_nc4_tests.sh
 
 # CDL files and Expected results
 SUBDIRS=cdl expected
diff --git a/ncgen/CMakeLists.txt b/ncgen/CMakeLists.txt
index 4ca82b56f2..6feb4b9393 100644
--- a/ncgen/CMakeLists.txt
+++ b/ncgen/CMakeLists.txt
@@ -42,10 +42,15 @@ FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 IF(ENABLE_TESTS)
   FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cdl ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
   FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
-  add_sh_test(ncgen run_tests)
-  IF(USE_NETCDF4)
-    add_sh_test(ncgen run_nc4_tests)
-  ENDIF()
+
+  ##
+  # The following tests were moved to ncdump/, to ensure
+  # that they are run in the proper order.
+  ##
+  #add_sh_test(ncgen run_tests)
+  #IF(USE_NETCDF4)
+  #  add_sh_test(ncgen run_nc4_tests)
+  #ENDIF()
 ENDIF()
 
 SET(MAN_FILES ncgen.1)
diff --git a/ncgen/Makefile.am b/ncgen/Makefile.am
index 9d28dcd791..71f1828494 100644
--- a/ncgen/Makefile.am
+++ b/ncgen/Makefile.am
@@ -22,7 +22,7 @@ man_MANS = ncgen.1
 
 # These files all need to be distributed.
 EXTRA_DIST = ncgen.y ncgen.l ncgenl.c $(man_MANS) internals.html	\
-run_tests.sh run_nc4_tests.sh c0.cdl c0_4.cdl ref_camrun.cdl \
+c0.cdl c0_4.cdl ref_camrun.cdl \
 ncf199.cdl CMakeLists.txt XGetopt.c c5.cdl \
 compound_datasize_test.cdl compound_datasize_test2.cdl \
 tst_gattenum.cdl tst_usuffix.cdl