diff --git a/Makefile.am b/Makefile.am
index f00bd48a4b..44ec7a852e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -781,9 +781,11 @@ support:
 # of longer test target names. Since the tests are expected to be run easily and rapidly after minor source
 # changes this is the most effective structure.
 
-TESTS =
 check_PROGRAMS =
 
 include tests/unit/unit.mk
 
+TESTS = $(check_PROGRAMS)
+
+tests: $(check_PROGRAMS)
 
diff --git a/tests/unit/unit.mk b/tests/unit/unit.mk
index 713fbb7d3e..68cd2e5d39 100644
--- a/tests/unit/unit.mk
+++ b/tests/unit/unit.mk
@@ -1,7 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 FSLD = $(top_builddir)/libfreeswitch.la $(top_builddir)/libs/apr/libapr-1.la $(top_builddir)/libs/apr-util/libaprutil-1.la
 
-TESTS += tests/unit/switch_event
 check_PROGRAMS += tests/unit/switch_event
 
 tests_unit_switch_event_SOURCES = tests/unit/switch_event.c
@@ -9,7 +8,6 @@ tests_unit_switch_event_CFLAGS = $(SWITCH_AM_CFLAGS)
 tests_unit_switch_event_LDADD = $(FSLD)
 tests_unit_switch_event_LDFLAGS = $(SWITCH_AM_LDFLAGS) -ltap
 
-TESTS += tests/unit/switch_hash
 check_PROGRAMS += tests/unit/switch_hash
 
 tests_unit_switch_hash_SOURCES = tests/unit/switch_hash.c