diff --git a/test/.gitignore b/test/.gitignore
index c49530e7..1a484d1b 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -11,7 +11,7 @@
 /maths*
 /matrix*
 /md[245]*
-/option
+/options
 /pool*
 /range*
 /region*
diff --git a/test/Makefile.am b/test/Makefile.am
index 875d6721..6a0215f6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -20,7 +20,7 @@ TEST_BIN = 		\
 	md2		\
 	md4		\
 	md5		\
-	option		\
+	options		\
 	pool		\
 	range 		\
 	region		\
@@ -28,64 +28,9 @@ TEST_BIN = 		\
 	sha1		\
 	version
 
+AM_DEFAULT_SOURCE_EXT = .cpp
+LDADD = $(builddir)/../libutil.la
+
 TESTS = $(TEST_BIN) json.pl
 check_PROGRAMS = $(TEST_BIN)
 EXTRA_DIST = json.pl
-
-backtrace_CPPFLAGS = $(COMMON_CXXFLAGS)
-backtrace_LDADD    = $(builddir)/../libutil.la
-backtrace_SOURCES  = backtrace.cpp
-
-bitwise_LDADD      = $(builddir)/../libutil.la
-bitwise_SOURCES    = bitwise.cpp
-
-checksum_LDADD	   = $(builddir)/../libutil.la
-checksum_SOURCES   = checksum.cpp
-
-float_LDADD        = $(builddir)/../libutil.la
-float_SOURCES      = float.cpp
-
-hton_LDADD	   = $(builddir)/../libutil.la
-hton_SOURCES	   = hton.cpp
-
-ip_LDADD      	   = $(builddir)/../libutil.la
-ip_SOURCES         = ip.cpp
-
-json_LDADD   	   = $(builddir)/../libutil.la
-json_SOURCES       = json.cpp
-
-maths_LDADD        = $(builddir)/../libutil.la
-maths_SOURCES      = maths.cpp
-
-matrix_LDADD       = $(builddir)/../libutil.la
-matrix_SOURCES     = matrix.cpp
-
-md2_LDADD          = $(builddir)/../libutil.la
-md2_SOURCES        = md2.cpp
-
-md4_LDADD          = $(builddir)/../libutil.la
-md4_SOURCES        = md4.cpp
-
-md5_LDADD          = $(builddir)/../libutil.la
-md5_SOURCES        = md5.cpp
-
-option_LDADD	   = $(builddir)/../libutil.la
-option_SOURCES     = options/success.cpp
-
-pool_LDADD         = $(builddir)/../libutil.la
-pool_SOURCES	   = pool.cpp
-
-range_LDADD        = $(builddir)/../libutil.la
-range_SOURCES 	   = range.cpp
-
-region_LDADD       = $(builddir)/../libutil.la
-region_SOURCES     = region.cpp
-
-signal_LDADD	   = $(builddir)/../libutil.la
-signal_SOURCES     = signal.cpp
-
-sha1_LDADD         = $(builddir)/../libutil.la
-sha1_SOURCES       = sha1.cpp
-
-version_LDADD      = $(builddir)/../libutil.la
-version_SOURCES    = version.cpp
diff --git a/test/options/success.cpp b/test/options.cpp
similarity index 100%
rename from test/options/success.cpp
rename to test/options.cpp