diff --git a/Makefile.am b/Makefile.am
index fbbe163..0048602 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,9 @@ path_combine_output_full_min = $(path_combine_output_full:.js=.min.js)
 src_js                = @SRC_JS@
 path_externs_internal = $(path_build)/externs-internal.js
 
+test_cases=$(shell find test/ -name '*Test.*' | tr '\n' ' ' )
+src_tests=$(shell find test/ -name test-* | tr '\n' ' ' )
+
 combine  = $(path_tools)/combine
 compiler = @CCJAR@
 MKDIR_P = @MKDIR_P@
@@ -106,7 +109,7 @@ html-single:
 	$(MAKE) -C "$(path_doc)" html-single
 
 test: check
-check: @SRC_TESTS@ test-suite
+check: $(src_tests) test-suite
 
 # performance tests
 perf: @PERF_TESTS@
@@ -130,7 +133,7 @@ if HAS_NODE
 	@echo "ease.js Test Suite"
 	@echo
 	@NODE_PATH="$(path_test):$(NODE_PATH)" $(NODE) --stack_trace_limit=20 \
-		$(path_test)/runner.js @TEST_CASES@
+		$(path_test)/runner.js $(test_cases)
 else
 	@echo "Node.js must be installed in order to run the test suite"
 	@exit 1
diff --git a/configure.ac b/configure.ac
index 41fe91f..973b881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,18 +81,6 @@ AS_IF(test "$JAVA" -a ! "$CCJAR",
 
 AM_CONDITIONAL(HAS_CCJAR, [test "$CCJAR"])
 
-# unit tests (old test system; refactoring needed)
-AC_MSG_CHECKING([for unit tests])
-SRC_TESTS="$( find test/ -name test-* | tr '\n' ' ' )"
-AC_SUBST(SRC_TESTS)
-AS_IF([test "$SRC_TESTS"], [AC_MSG_RESULT(ok)], [AC_MSG_WARN(none found)])
-
-# test cases (new test system)
-AC_MSG_CHECKING([for test cases])
-TEST_CASES="$( find test/ -name '*Test.*' | tr '\n' ' ' )"
-AC_SUBST(TEST_CASES)
-AS_IF([test "$TEST_CASES"], [AC_MSG_RESULT(ok)], [AC_MSG_WARN(none found)])
-
 # check for performance tests
 AC_MSG_CHECKING([for performance tests])
 PERF_TESTS=$( find test/perf -name 'perf-*.js' | tr '\n' ' ' )