diff --git a/Makefile b/Makefile
index 9c241b8..2a1ba2d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@
 all:
 	cd library  && make all && cd ..
 	cd programs && make all && cd ..
+	cd tests && make all && cd ..
 
 install:
 	mkdir -p $(DESTDIR)/include/polarssl
@@ -27,4 +28,5 @@
 clean:
 	cd library  && make clean && cd ..
 	cd programs && make clean && cd ..
+	cd tests && make clean && cd ..
 
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 0000000..0954def
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,81 @@
+
+# To compile on SunOS: add "-lsocket -lnsl" to LDFLAGS
+# To compile on MinGW: add "-lws2_32" to LDFLAGS
+
+CFLAGS	= -I../include -D_FILE_OFFSET_BITS=64 -Wall -Wdeclaration-after-statement \
+			-Wno-unused-function -Wno-unused-value
+
+OFLAGS	= -O
+LDFLAGS	= -L../library -lpolarssl
+
+APPS =	test_suite_aes			test_suite_arc4		\
+		test_suite_base64		test_suite_camellia	\
+		test_suite_des			test_suite_dhm		\
+		test_suite_hmac_shax	test_suite_mdx		\
+		test_suite_mpi			test_suite_rsa		\
+		test_suite_shax			test_suite_x509parse\
+		test_suite_xtea
+
+.SILENT:
+
+all: $(APPS)
+
+%.c : suites/%.function suites/%.data scripts/generate_code.pl
+	echo   "  Generate	$@"
+	scripts/generate_code.pl suites $*
+
+test_suite_aes: test_suite_aes.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_arc4: test_suite_arc4.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_base64: test_suite_base64.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_camellia: test_suite_camellia.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_des: test_suite_des.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_dhm: test_suite_dhm.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_hmac_shax: test_suite_hmac_shax.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_mdx: test_suite_mdx.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_mpi: test_suite_mpi.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_rsa: test_suite_rsa.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_shax: test_suite_shax.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_x509parse: test_suite_x509parse.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+test_suite_xtea: test_suite_xtea.c ../library/libpolarssl.a
+	echo   "  CC    	$@.c"
+	$(CC) $(CFLAGS) $(OFLAGS) $@.c	$(LDFLAGS) -o $@
+
+clean:
+	rm -f $(APPS) *.c
+