diff --git a/libsrc4/Makefile.am b/libsrc4/Makefile.am
index f1cad8bc9..5c516b36d 100644
--- a/libsrc4/Makefile.am
+++ b/libsrc4/Makefile.am
@@ -112,7 +112,7 @@ libnetcdf_la_LIBADD += ${top_builddir}/libsrc/libnetcdf3.la
 # Include netcdf-2 unless v2 has been turned off..
 if BUILD_V2
 libnetcdf_la_LIBADD += ${top_builddir}/libsrc/libnetcdf2.la
-TST_V2 = tst_v2 
+#TST_V2 = tst_v2 
 endif
 
 # Netcdf-4 source.
@@ -141,12 +141,11 @@ tst_h_compounds tst_h_compounds2 tst_h_wrt_cmp tst_h_rd_cmp tst_h_vl	\
 tst_h_opaques tst_h_strings tst_h_strings1 tst_h_dimscales		\
 tst_h_dimscales1 tst_h_dimscales2 tst_h_dimscales3 tst_h_enums		\
 tst_h_vl2 tst_dims tst_dims2 tst_dims3 tst_files tst_files4 tst_vars	\
-tst_varms tst_unlim_vars tst_atts tst_atts2 tst_converts tst_converts2	\
-tst_grps tst_compounds tst_compounds2 tst_compounds3 tst_vl		\
-tst_opaques tst_strings tst_interops tst_interops4 tst_interops5	\
-tst_enums tst_vars2 tst_coords tst_coords2 tst_coords3 tst_vars3	\
-tst_chunks tst_utf8 tst_fills tst_fillbug $(TST_V2) tst_xplatform	\
-tst_xplatform2 tst_endian_fill
+tst_varms tst_unlim_vars tst_converts tst_converts2 tst_grps		\
+tst_compounds tst_compounds2 tst_compounds3 tst_opaques tst_strings	\
+tst_interops tst_interops4 tst_interops5 tst_enums tst_coords		\
+tst_coords2 tst_coords3 tst_vars3 tst_chunks tst_utf8 tst_fills		\
+tst_fillbug tst_xplatform tst_xplatform2 tst_endian_fill
 
 if LARGE_FILE_TESTS
 check_PROGRAMS += tst_large tst_large2
@@ -162,12 +161,12 @@ tst_h_vars2 tst_h_vars3 tst_h_grps tst_h_compounds tst_h_compounds2	\
 tst_h_wrt_cmp tst_h_rd_cmp tst_h_vl tst_h_opaques tst_h_strings		\
 tst_h_strings1 tst_h_dimscales tst_h_dimscales1 tst_h_dimscales2	\
 tst_h_dimscales3 tst_h_enums tst_dims tst_dims2 tst_dims3 tst_files	\
-tst_files4 tst_vars tst_varms tst_unlim_vars tst_atts tst_atts2		\
-tst_converts tst_converts2 tst_grps tst_compounds tst_compounds2	\
-tst_compounds3 tst_vl tst_h_vl2 tst_opaques tst_strings tst_interops	\
-tst_interops4 tst_interops5 tst_enums tst_vars2 tst_vars3 tst_chunks	\
-tst_coords tst_coords2 tst_coords3 tst_utf8 tst_fills tst_fillbug	\
-$(TST_V2) tst_xplatform tst_xplatform2 tst_h_atts2 tst_endian_fill
+tst_files4 tst_vars tst_varms tst_unlim_vars tst_converts		\
+tst_converts2 tst_grps tst_compounds tst_compounds2 tst_compounds3	\
+tst_h_vl2 tst_opaques tst_strings tst_interops tst_interops4		\
+tst_interops5 tst_enums tst_vars3 tst_chunks tst_coords tst_coords2	\
+tst_coords3 tst_utf8 tst_fills tst_fillbug tst_xplatform		\
+tst_xplatform2 tst_h_atts2 tst_endian_fill
 
 EXTRA_DIST = ref_tst_compounds.nc ref_tst_h_compounds.h5		\
 ref_tst_h_compounds2.h5 run_par_tests.sh run_valgrind_tests.sh		\
diff --git a/nc_test4/Makefile.am b/nc_test4/Makefile.am
index e7e44c724..02576e3d1 100644
--- a/nc_test4/Makefile.am
+++ b/nc_test4/Makefile.am
@@ -14,10 +14,16 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)/liblib @EXTERN_CFLAGS@
 AM_CPPFLAGS += -I$(top_srcdir)/libsrc4 -I$(top_srcdir)/libsrc
 
 # Our test programs and sources...
-check_PROGRAMS = t_type cdm_sea_soundings tst_camrun
+NC4_TEST_PROGS = t_type cdm_sea_soundings tst_camrun tst_vl tst_atts	\
+tst_atts2 tst_vars2 tst_v2
 cdm_sea_soundings_SOURCES = cdm_sea_soundings.c tests.h
 tst_camrun_SOURCES = tst_camrun.c tests.h
-TESTS = t_type cdm_sea_soundings tst_camrun
+check_PROGRAMS = $(NC4_TEST_PROGS)
+TESTS = $(NC4_TEST_PROGS)
+
+#if BUILD_V2
+#TESTS += tst_v2 
+#endif # BUILD_V2
 
 if LARGE_FILE_TESTS
 tst_large_SOURCES = tst_large.c tests.h
diff --git a/libsrc4/tst_atts.c b/nc_test4/tst_atts.c
similarity index 100%
rename from libsrc4/tst_atts.c
rename to nc_test4/tst_atts.c
diff --git a/libsrc4/tst_atts2.c b/nc_test4/tst_atts2.c
similarity index 100%
rename from libsrc4/tst_atts2.c
rename to nc_test4/tst_atts2.c
diff --git a/libsrc4/tst_v2.c b/nc_test4/tst_v2.c
similarity index 100%
rename from libsrc4/tst_v2.c
rename to nc_test4/tst_v2.c
diff --git a/libsrc4/tst_vars2.c b/nc_test4/tst_vars2.c
similarity index 100%
rename from libsrc4/tst_vars2.c
rename to nc_test4/tst_vars2.c
diff --git a/libsrc4/tst_vl.c b/nc_test4/tst_vl.c
similarity index 100%
rename from libsrc4/tst_vl.c
rename to nc_test4/tst_vl.c