diff --git a/Makefile.am b/Makefile.am
index 13795164..0f7b5d3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,9 +68,5 @@ SUBDIRS = \
   tests \
   tools
 
-if PERFORM_UNIT_TESTS
-SUBDIRS += tests
-endif
-
 distclean-local:
 	-rm -f xrdp_configure_options.h
diff --git a/configure.ac b/configure.ac
index 3448877a..ef61d007 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,9 +377,6 @@ if test "x$perform_unit_tests" == "xyes"; then
 else
     AC_MSG_NOTICE([libcheck not found, unit tests will be skipped])
 fi
-
-AM_CONDITIONAL(PERFORM_UNIT_TESTS,
-               [test "x$perform_unit_tests" = "xyes"])
 # -- end perform unit tests
 
 AC_SUBST([moduledir], '${libdir}/xrdp')
diff --git a/tests/memtest/Makefile.am b/tests/memtest/Makefile.am
index 8901722f..890f2716 100644
--- a/tests/memtest/Makefile.am
+++ b/tests/memtest/Makefile.am
@@ -6,9 +6,6 @@ if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
 endif
 
-noinst_PROGRAMS = \
-  memtest
-
 check_PROGRAMS = \
   memtest