diff --git a/.gitignore b/.gitignore
index 659fa108..d67e3a22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ keygen/xrdp-keygen
 .libs
 libtool
 *.lo
+*.log
 ltmain.sh
 Makefile
 Makefile.in
@@ -41,6 +42,10 @@ sesman/xrdp-sesman
 sesman/sesman.ini
 *.so
 stamp-h1
+test-driver
+tests/memtest/memtest
+tests/tcp_proxy/tcp_proxy
+*.trs
 xrdp/xrdp
 xrdp/xrdp.ini
 xrdp_configure_options.h
diff --git a/Makefile.am b/Makefile.am
index 2d15c7d7..7db0ce27 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@ EXTRA_DIST = \
   m4 \
   postinstall-pak \
   tcutils \
-  tests \
   vrplayer
 
 if XRDP_NEUTRINORDP
@@ -64,7 +63,8 @@ SUBDIRS = \
   genkeymap \
   xrdpapi \
   pkgconfig \
-  $(XRDPVRDIR)
+  $(XRDPVRDIR) \
+  tests
 
 distclean-local:
 	-rm -f xrdp_configure_options.h
diff --git a/configure.ac b/configure.ac
index 6f8c4a4b..e58441df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,6 +397,9 @@ AC_CONFIG_FILES([
   sesman/libscp/Makefile
   sesman/Makefile
   sesman/tools/Makefile
+  tests/Makefile
+  tests/memtest/Makefile
+  tests/tcp_proxy/Makefile
   vnc/Makefile
   xrdpapi/Makefile
   xrdp/Makefile
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index 24600083..00000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 00000000..4ea4b584
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,8 @@
+
+EXTRA_DIST = \
+  gtcp_proxy \
+  readme.txt
+
+SUBDIRS = \
+  memtest \
+  tcp_proxy
diff --git a/tests/memtest/Makefile b/tests/memtest/Makefile
deleted file mode 100644
index c0310ece..00000000
--- a/tests/memtest/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-OBJS = libmem.o memtest.o
-
-#CFLAGS = -O2 -Wall
-CFLAGS = -g
-
-all: memtest
-
-memtest: $(OBJS)
-	$(CC) -o memtest $(OBJS)
-
-clean:
-	rm -f $(OBJS) librdp.a
diff --git a/tests/memtest/Makefile.am b/tests/memtest/Makefile.am
new file mode 100644
index 00000000..ba8d6dac
--- /dev/null
+++ b/tests/memtest/Makefile.am
@@ -0,0 +1,11 @@
+
+sbin_PROGRAMS = \
+  memtest
+
+memtest_SOURCES = \
+  libmem.h \
+  libmem.c \
+  memtest.c
+
+TESTS = \
+  memtest
\ No newline at end of file
diff --git a/tests/memtest/memtest.c b/tests/memtest/memtest.c
index c67ec55a..523b5376 100644
--- a/tests/memtest/memtest.c
+++ b/tests/memtest/memtest.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "libmem.h"
 
diff --git a/tests/tcp_proxy/Makefile b/tests/tcp_proxy/Makefile
deleted file mode 100644
index 8f5821d3..00000000
--- a/tests/tcp_proxy/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-CFLAGS = -O2 -Wall
-LDFLAGS =
-OBJS = main.o
-LIBS = -ldl
-
-all: tcp_proxy
-
-tcp_proxy: $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o tcp_proxy $(OBJS) $(LIBS)
-
-.PHONY clean:
-	rm -f $(OBJS) tcp_proxy
diff --git a/tests/tcp_proxy/Makefile.am b/tests/tcp_proxy/Makefile.am
new file mode 100644
index 00000000..d083dd08
--- /dev/null
+++ b/tests/tcp_proxy/Makefile.am
@@ -0,0 +1,9 @@
+
+sbin_PROGRAMS = \
+  tcp_proxy
+
+tcp_proxy_SOURCES = \
+  main.c
+
+tcp_proxy_LDADD = \
+  -ldl
\ No newline at end of file