diff --git a/configure.ac b/configure.ac
index deed51e78c8..81ba9e9ee65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,5 +137,6 @@ AC_OUTPUT(Makefile
           src/flib/Makefile
           tests/Makefile
           tests/cunit/Makefile
+          tests/unit/Makefile
           examples/Makefile
           examples/c/Makefile)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 310b861b712..f9b21449642 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,4 +3,9 @@
 
 # Ed Hartnett
 
-SUBDIRS = cunit
+# Does the user want to build fortran?
+if BUILD_FORTRAN
+UNIT = unit
+endif
+
+SUBDIRS = cunit ${UNIT}
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
new file mode 100644
index 00000000000..613cedca0a3
--- /dev/null
+++ b/tests/unit/Makefile.am
@@ -0,0 +1,22 @@
+## This is the automake file for building the Fortran tests for the
+## PIO library.
+
+# Ed Hartnett 3/20/19
+
+# Link to our assembled library.
+AM_LDFLAGS = ${top_builddir}/src/clib/libpio.la
+AM_CPPFLAGS = -I$(top_srcdir)/src/clib
+LDADD = ${top_builddir}/src/clib/libpio.la
+
+# Build the tests for make check.
+#check_PROGRAMS = test_intercomm2 test_async_mpi test_spmd
+
+
+# Tests will run from a bash script.
+#TESTS = run_tests.sh
+
+# Distribute the test script.
+#EXTRA_DIST = run_tests.sh
+
+# Clean up files produced during testing.
+CLEANFILES = *.nc *.log