diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index fd6b402877..7577fa23b9 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,11 +1,15 @@
 FSLD = $(top_builddir)/libfreeswitch.la $(top_builddir)/libs/apr/libapr-1.la $(top_builddir)/libs/apr-util/libaprutil-1.la
 
-TESTS = event_create
 
 if HAVE_TAP
 
-check_PROGRAMS = event_create
+TESTS = switch_event
+check_PROGRAMS = switch_event
 
+switch_event_SOURCES = switch_event.c
+switch_event_CFLAGS = $(SWITCH_AM_CFLAGS)
+switch_event_LDADD = $(FSLD)
+switch_event_LDFLAGS = $(SWITCH_AM_LDFLAGS) -ltap
 
 event_create_SOURCES = event_create.c
 event_create_CFLAGS = $(SWITCH_AM_CFLAGS)
diff --git a/tests/unit/event_create.c b/tests/unit/switch_event.c
similarity index 100%
rename from tests/unit/event_create.c
rename to tests/unit/switch_event.c