diff --git a/c/test/input/Makefile.am b/c/test/input/Makefile.am
index 5c7668594..f6b8ee6b0 100644
--- a/c/test/input/Makefile.am
+++ b/c/test/input/Makefile.am
@@ -1,3 +1,4 @@
+SUBDIRS=	rfc-csv
 EXTRA_DIST=	\
 		a.csv \
 		a.pprint \
@@ -27,14 +28,6 @@ EXTRA_DIST=	\
 		null-fields.csv \
 		null-fields.nidx \
 		regularize.dkvp \
-		rfc-csv/narrow-truncated.csv \
-		rfc-csv/narrow.csv \
-		rfc-csv/quoted-comma-truncated.csv \
-		rfc-csv/quoted-comma.csv \
-		rfc-csv/quoted-crlf-truncated.csv \
-		rfc-csv/quoted-crlf.csv \
-		rfc-csv/simple-truncated.csv \
-		rfc-csv/simple.csv \
 		sec2gmt \
 		sec2xhms \
 		short \
diff --git a/c/test/input/rfc-csv/Makefile.am b/c/test/input/rfc-csv/Makefile.am
new file mode 100644
index 000000000..fb035dd89
--- /dev/null
+++ b/c/test/input/rfc-csv/Makefile.am
@@ -0,0 +1,10 @@
+EXTRA_DIST=	\
+		modify-defaults.csv \
+		narrow-truncated.csv \
+		narrow.csv \
+		quoted-comma-truncated.csv \
+		quoted-comma.csv \
+		quoted-crlf-truncated.csv \
+		quoted-crlf.csv \
+		simple-truncated.csv \
+		simple.csv
diff --git a/configure.ac b/configure.ac
index 217fc9211..220b90bd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ AC_CONFIG_FILES([Makefile
 		c/test/Makefile
 		c/test/expected/Makefile
 		c/test/input/Makefile
+		c/test/input/rfc-csv/Makefile
 		c/tools/Makefile
 		c/Makefile
 		doc/Makefile])