diff --git a/configure.ac b/configure.ac
index 5ab06b779..0f799bcd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1358,14 +1358,6 @@ if test "x$enable_jna" = xyes ; then
 AC_DEFINE([JNA], [1], [if true, include JNA bug fix])
 fi
 
-# Control large metadata performance test
-AC_MSG_CHECKING([whether large metadata performance testing should be run])
-AC_ARG_ENABLE([metadata-perf],
-              [AS_HELP_STRING([--enable-metadata-perf],
-                              [Test performance of nc_create and nc_open on large metadata])])
-test "x$enable_metadata_perf" = xyes || enable_metadata_perf=no
-AC_MSG_RESULT($enable_metadata_perf)
-
 # Control filter test/example
 AC_MSG_CHECKING([whether filter testing should be run])
 AC_ARG_ENABLE([filter-testing],
diff --git a/nc_perf/Makefile.am b/nc_perf/Makefile.am
index 4341dfe01..ed68ef62d 100644
--- a/nc_perf/Makefile.am
+++ b/nc_perf/Makefile.am
@@ -19,7 +19,7 @@ LDADD = ${top_builddir}/liblib/libnetcdf.la
 check_PROGRAMS = tst_create_files bm_file tst_chunks3 tst_ar4		\
 tst_ar4_3d tst_ar4_4d bm_many_objs tst_h_many_atts bm_many_atts		\
 tst_files2 tst_files3 tst_mem tst_knmi bm_netcdf4_recs tst_wrf_reads	\
-tst_attsperf
+tst_attsperf bigmeta openbigmeta
 
 bm_file_SOURCES = bm_file.c tst_utils.c
 bm_netcdf4_recs_SOURCES = bm_netcdf4_recs.c tst_utils.c
@@ -34,7 +34,7 @@ tst_knmi_SOURCES = tst_knmi.c tst_utils.c
 tst_wrf_reads_SOURCES = tst_wrf_reads.c tst_utils.c
 
 TESTS = tst_ar4_3d tst_create_files tst_files3 tst_mem run_knmi_bm.sh	\
-tst_wrf_reads tst_attsperf
+tst_wrf_reads tst_attsperf perftest.sh
 #run_bm_elena.sh run_tst_chunks.sh
 
 #run_bm_elena.log: tst_create_files.log tst_files.log
@@ -58,3 +58,6 @@ EXTRA_DIST = run_par_bm_test.sh.in run_knmi_bm.sh CMakeLists.txt
 CLEANFILES = tst_*.nc
 
 DISTCLEANFILES = run_par_bm_test.sh MSGCPP_CWP_NC*.nc
+
+# If valgrind is present, add valgrind targets.
+@VALGRIND_CHECK_RULES@
diff --git a/nc_test4/bigmeta.c b/nc_perf/bigmeta.c
similarity index 100%
rename from nc_test4/bigmeta.c
rename to nc_perf/bigmeta.c
diff --git a/nc_test4/openbigmeta.c b/nc_perf/openbigmeta.c
similarity index 100%
rename from nc_test4/openbigmeta.c
rename to nc_perf/openbigmeta.c
diff --git a/nc_test4/perftest.sh b/nc_perf/perftest.sh
similarity index 100%
rename from nc_test4/perftest.sh
rename to nc_perf/perftest.sh
diff --git a/nc_test4/Makefile.am b/nc_test4/Makefile.am
index 13644e694..e9ed1d07a 100644
--- a/nc_test4/Makefile.am
+++ b/nc_test4/Makefile.am
@@ -86,21 +86,16 @@ tst_mode
 TESTS += run_par_test.sh
 endif
 
-if ENABLE_METADATA_PERF
-check_PROGRAMS += bigmeta openbigmeta
-TESTS += perftest.sh
-endif
-
 EXTRA_DIST = run_par_test.sh.in run_bm_test1.sh run_bm_test2.sh		\
 ref_tst_compounds.nc ref_tst_xplatform2_1.nc ref_tst_xplatform2_2.nc	\
-ref_tst_dims.nc ref_tst_interops4.nc CMakeLists.txt	\
-run_grp_rename.sh tst_h5_endians.c tst_atts_string_rewrite.c		\
+ref_tst_dims.nc ref_tst_interops4.nc CMakeLists.txt run_grp_rename.sh	\
+tst_h5_endians.c tst_atts_string_rewrite.c				\
 tst_put_vars_two_unlim_dim.c tst_empty_vlen_unlim.c			\
 run_empty_vlen_test.sh ref_hdf5_compat1.nc ref_hdf5_compat2.nc		\
 ref_hdf5_compat3.nc tst_misc.sh tdset.h5 tst_szip.sh ref_szip.h5	\
 ref_szip.cdl tst_filter.sh bzip2.cdl ref_filtered.cdl			\
-ref_unfiltered.cdl ref_bzip2.c findplugin.in perftest.sh		\
-ref_unfilteredvv.cdl ref_filteredvv.cdl
+ref_unfiltered.cdl ref_bzip2.c findplugin.in ref_unfilteredvv.cdl	\
+ref_filteredvv.cdl
 
 CLEANFILES = tst_mpi_parallel.bin cdm_sea_soundings.nc bm_chunking.nc	\
 tst_floats_1D.cdl floats_1D_3.nc floats_1D.cdl tst_*.nc			\