diff --git a/.gitignore b/.gitignore
index ee2053048..44ff8d102 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,8 @@ output
 mcapi/test
 testsuite/testsuite
 tests/unit
+testsuite/testsuite.test
+tests/unit.test
 testsuite/*.der
 testsuite/*.pem
 testsuite/*.raw
diff --git a/Makefile.am b/Makefile.am
index 02fea25cc..1c03717ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,8 +76,10 @@ if USE_VALGRIND
 TESTS_ENVIRONMENT=./valgrind-error.sh
 endif
 
+TEST_EXTENSIONS=.test
 TESTS += $(check_PROGRAMS)
 test: check
+testsuite/testsuite.log: tests/unit.log
 
 DISTCLEANFILES+= cyassl-config 
 
diff --git a/tests/include.am b/tests/include.am
index 239a169be..8fcc542cf 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -4,20 +4,20 @@
 
 
 if BUILD_EXAMPLES
-check_PROGRAMS += tests/unit
-noinst_PROGRAMS += tests/unit
-tests_unit_SOURCES = \
+check_PROGRAMS += tests/unit.test
+noinst_PROGRAMS += tests/unit.test
+tests_unit_test_SOURCES = \
                   tests/unit.c \
                   tests/api.c \
                   tests/suites.c \
                   tests/hash.c \
                   examples/client/client.c \
                   examples/server/server.c
-tests_unit_CFLAGS       = -DNO_MAIN_DRIVER $(AM_CFLAGS)
-tests_unit_LDADD        = src/libcyassl.la
-tests_unit_DEPENDENCIES = src/libcyassl.la
+tests_unit_test_CFLAGS       = -DNO_MAIN_DRIVER $(AM_CFLAGS)
+tests_unit_test_LDADD        = src/libcyassl.la
+tests_unit_test_DEPENDENCIES = src/libcyassl.la
 endif
 EXTRA_DIST += tests/unit.h
 EXTRA_DIST += tests/test.conf \
               tests/test-dtls.conf
-DISTCLEANFILES+= tests/.libs/unit
+DISTCLEANFILES+= tests/.libs/unit.test
diff --git a/testsuite/include.am b/testsuite/include.am
index 6f4bac772..900ee8d9a 100644
--- a/testsuite/include.am
+++ b/testsuite/include.am
@@ -4,22 +4,22 @@
 
 
 if BUILD_EXAMPLES
-check_PROGRAMS += testsuite/testsuite
-noinst_PROGRAMS += testsuite/testsuite
-testsuite_testsuite_SOURCES = \
+check_PROGRAMS += testsuite/testsuite.test
+noinst_PROGRAMS += testsuite/testsuite.test
+testsuite_testsuite_test_SOURCES = \
 			      ctaocrypt/test/test.c \
 			      examples/client/client.c \
 			      examples/echoclient/echoclient.c \
 			      examples/echoserver/echoserver.c \
 			      examples/server/server.c \
 			      testsuite/testsuite.c
-testsuite_testsuite_CFLAGS       = -DNO_MAIN_DRIVER $(AM_CFLAGS)
-testsuite_testsuite_LDADD        = src/libcyassl.la
-testsuite_testsuite_DEPENDENCIES = src/libcyassl.la
+testsuite_testsuite_test_CFLAGS       = -DNO_MAIN_DRIVER $(AM_CFLAGS)
+testsuite_testsuite_test_LDADD        = src/libcyassl.la
+testsuite_testsuite_test_DEPENDENCIES = src/libcyassl.la
 endif
 EXTRA_DIST += testsuite/testsuite.sln
 EXTRA_DIST += testsuite/testsuite-ntru.vcproj
 EXTRA_DIST += testsuite/testsuite.vcproj
 EXTRA_DIST += input
 EXTRA_DIST += quit
-DISTCLEANFILES+= testsuite/.libs/testsuite
+DISTCLEANFILES+= testsuite/.libs/testsuite.test