diff --git a/configure.ac b/configure.ac
index 81ba9e9ee65..a0dcaaedd8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,5 +138,6 @@ AC_OUTPUT(Makefile
           tests/Makefile
           tests/cunit/Makefile
           tests/unit/Makefile
+          tests/general/Makefile
           examples/Makefile
           examples/c/Makefile)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a662c079a55..7377b2aa9a5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,11 +3,13 @@
 
 # Ed Hartnett
 
-# Does the user want to build fortran?
+# Does the user want to build fortran? If so, there are two additional
+# test directories.
 if BUILD_FORTRAN
 UNIT = unit
+GENERAL = general
 endif
 
-SUBDIRS = cunit ${UNIT}
+SUBDIRS = cunit ${UNIT} ${GENERAL}
 
 EXTRA_DIST = CMakeLists.txt
diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
new file mode 100644
index 00000000000..a411be8c0bb
--- /dev/null
+++ b/tests/general/Makefile.am
@@ -0,0 +1,34 @@
+## This is the automake file for building the Fortran general tests
+## for the PIO library.
+
+# Ed Hartnett 3/22/19
+
+# Link to our assembled library.
+AM_LDFLAGS = ${top_builddir}/src/clib/libpio.la
+AM_CPPFLAGS = -I$(top_srcdir)/src/flib
+AM_CPPFLAGS += "-D_NETCDF -D_NETCDF4 -D_PETCDF"
+LDADD = ${top_builddir}/src/clib/libpiof.la
+
+# # Build the test for make check.
+# check_PROGRAMS = pio_unit_test_driver
+# pio_unit_test_driver_SOURCES = driver.F90
+# pio_unit_test_driver_LDADD = libglobal_vars.la libncdf_tests.la	\
+# libbasic_tests.la ${top_builddir}/src/flib/libpiof.la ${top_builddir}/src/clib/libpio.la
+
+# # Build these uninstalled convenience libraries.
+# noinst_LTLIBRARIES = libglobal_vars.la libncdf_tests.la	\
+# libbasic_tests.la
+
+# # The convenience libraries depends on their source.
+# libglobal_vars_la_SOURCES = global_vars.F90
+# libncdf_tests_la_SOURCES = ncdf_tests.F90
+# libbasic_tests_la_SOURCES = basic_tests.F90
+
+# # Tests will run from a bash script.
+# #TESTS = run_tests.sh
+
+# Distribute the test script.
+EXTRA_DIST = CMakeLists.txt #run_tests.sh
+
+# Clean up files produced during testing.
+CLEANFILES = *.nc *.log