diff --git a/security/Makefile.am b/security/Makefile.am
index 642f7296d..63d22ac69 100644
--- a/security/Makefile.am
+++ b/security/Makefile.am
@@ -1,17 +1,7 @@
 EXTRA_DIST =  sctest.c
-#security_test_SOURCES = security_test.c aes.h AESStringCrypt.h password.h security.h sha256.h
 
-#security_test_LIBS = libsecurity.la
-#security_test_LDFLAGS = -L.
-#security_test_CFLAGS = -L. -I.
-
-#bin_PROGRAMS = security_test
 noinst_LTLIBRARIES = libsecurity.la
-#noinst_PROGRAMS = security_test
 
 libsecurity_la_SOURCES = aes.c AESStringCrypt.c password.c security.c sha256.c aes.h AESStringCrypt.h  password.h  security.h  sha256.h
 libsecurity_la_CFLAGS = -I$(srcdir)
 LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/security/libsecurity.la
-#security_test_LDADD = $(LDADD)
-
-#check_PROGRAMS = security_test
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 564ff2dad..bdfe19e41 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,7 +16,7 @@ DISTCLEANFILES = rigctl.log rigctl.sum testbcd.log testbcd.sum
 
 bin_PROGRAMS = rigctl rigctld rigmem rigsmtr rigswr rotctl rotctld rigctlcom ampctl ampctld $(TESTLIBUSB)
 
-check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie testgrid
+check_PROGRAMS = dumpmem testrig testrigopen testrigcaps testtrn testbcd testfreq listrigs testloc rig_bench testcache cachetest cachetest2 testcookie testgrid testsecurity
 
 RIGCOMMONSRC = rigctl_parse.c rigctl_parse.h dumpcaps.c uthash.h 
 ROTCOMMONSRC = rotctl_parse.c rotctl_parse.h dumpcaps_rot.c uthash.h 
@@ -37,7 +37,7 @@ if HAVE_LIBUSB
 endif
 
 # include generated include files ahead of any in sources
-rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) $(AM_CPPFLAGS)
+rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) -I$(top_builddir)/security $(AM_CPPFLAGS) 
 
 # all the programs need this
 LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la $(DL_LIBS)
@@ -52,6 +52,7 @@ rigctlcom_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 if HAVE_LIBUSB
     rigtestlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
 endif
+testsecurity_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src -I$(top_builddir)/security
 
 rigctl_LDADD = $(PTHREAD_LIBS) $(READLINE_LIBS) $(LDADD)
 rigctld_LDADD = $(NET_LIBS) $(PTHREAD_LIBS) $(LDADD) $(READLINE_LIBS)
diff --git a/security/security_test.c b/tests/testsecurity.c
similarity index 100%
rename from security/security_test.c
rename to tests/testsecurity.c