diff --git a/.gitignore b/.gitignore
index bb8457b80..51031be9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ examples/server/server
 snifftest
 output
 testsuite/testsuite
+tests/unit
 testsuite/*.der
 testsuite/*.pem
 testsuite/*.raw
diff --git a/Makefile.am b/Makefile.am
index d6bc70bbd..a502fe4f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,7 @@ include examples/server/include.am
 include examples/echoclient/include.am
 include examples/echoserver/include.am
 include testsuite/include.am
+include tests/include.am
 include sslSniffer/sslSnifferTest/include.am
 
 TESTS += $(check_PROGRAMS)
diff --git a/configure.ac b/configure.ac
index bce86ca92..13c3eedf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([cyassl],[2.0.3],[http://www.yassl.com])
+AC_INIT([cyassl],[2.0.4],[http://www.yassl.com])
 
 AC_CONFIG_AUX_DIR(config)
 
diff --git a/tests/include.am b/tests/include.am
new file mode 100644
index 000000000..5cc96c2db
--- /dev/null
+++ b/tests/include.am
@@ -0,0 +1,14 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+
+check_PROGRAMS += tests/unit
+noinst_PROGRAMS += tests/unit
+tests_unit_SOURCES = \
+			      tests/unit.c \
+			      tests/api.c \
+			      tests/suites.c
+tests_unit_CFLAGS       = $(AM_CFLAGS)
+tests_unit_LDADD        = src/libcyassl.la 
+tests_unit_DEPENDENCIES = src/libcyassl.la
diff --git a/tests/unit.c b/tests/unit.c
new file mode 100644
index 000000000..e3fa84dac
--- /dev/null
+++ b/tests/unit.c
@@ -0,0 +1,9 @@
+/* unit.c unit tests driver */
+#include <stdio.h>
+
+int main(int argc, char** argv)
+{
+    printf("hello unit tests\n");
+
+    return 0;
+}