diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index ebda0cd501f..16858280bf8 100644
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -15,13 +15,12 @@ AM_CPPFLAGS += -I${top_builddir}/tests/general/util
 SRCDIRS = util
 
 # Build the test for make check.
-check_PROGRAMS = pio_init_finalize #pio_file_simple_tests
+check_PROGRAMS = pio_init_finalize pio_file_simple_tests	\
+pio_file_fail ncdf_simple_tests
 pio_init_finalize_SOURCES = pio_init_finalize.F90
-# pio_init_finalize_LDADD = util/libpio_tutil.la	\
-# ${top_builddir}/src/flib/libpiof.la		\
-# ${top_builddir}/src/clib/libpio.la
-
-
+pio_file_simple_tests_SOURCES = pio_file_simple_tests.F90
+pio_file_fail_SOURCES = pio_file_fail.F90
+ncdf_simple_tests_SOURCES = ncdf_simple_tests.F90
 
 # Tests will run from a bash script.
 TESTS = run_tests.sh
diff --git a/tests/general/run_tests.sh b/tests/general/run_tests.sh
index c684a9f64b5..a4a32223673 100755
--- a/tests/general/run_tests.sh
+++ b/tests/general/run_tests.sh
@@ -10,7 +10,8 @@ trap exit INT TERM
 
 printf 'running PIO tests...\n'
 
-PIO_TESTS='pio_init_finalize pio_file_simple_tests'
+PIO_TESTS='pio_init_finalize pio_file_simple_tests pio_file_fail '\
+'ncdf_simple_tests'
 
 success1=true
 for TEST in $PIO_TESTS