diff --git a/.gitignore b/.gitignore
index 56d1a6d..e2c91d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,12 +49,12 @@ tools/rfcomm
 tools/l2ping
 tools/l2test
 tools/rctest
+tools/scotest
 tools/sdptool
 tools/avtest
 test/agent
 test/bdaddr
 test/hciemu
-test/scotest
 test/gaptest
 test/sdptest
 test/lmptest
diff --git a/Makefile.tools b/Makefile.tools
index 06a0ca2..169be2c 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -5,7 +5,7 @@ bin_PROGRAMS += tools/rfcomm tools/l2ping tools/l2test tools/rctest \
 
 bin_PROGRAMS += tools/hciattach tools/hciconfig
 
-noinst_PROGRAMS += tools/avinfo tools/avtest \
+noinst_PROGRAMS += tools/avinfo tools/avtest tools/scotest \
 			tools/hcieventmask tools/hcisecfilter
 
 tools_rfcomm_SOURCES = tools/rfcomm.c
@@ -43,6 +43,8 @@ tools_avinfo_LDADD = lib/libbluetooth-private.la
 
 tools_avtest_LDADD = lib/libbluetooth-private.la
 
+tools_scotest_LDADD = lib/libbluetooth-private.la
+
 tools_hcieventmask_LDADD = lib/libbluetooth-private.la
 
 noinst_PROGRAMS += tools/btmgmt tools/btattach tools/btsnoop \
@@ -151,7 +153,7 @@ endif
 if TEST
 bin_PROGRAMS += test/hciemu
 
-noinst_PROGRAMS += test/gaptest test/sdptest test/scotest \
+noinst_PROGRAMS += test/gaptest test/sdptest \
 					test/lmptest test/bdaddr test/agent \
 					test/btiotest test/mpris-player
 
@@ -161,8 +163,6 @@ test_gaptest_LDADD = @DBUS_LIBS@
 
 test_sdptest_LDADD = lib/libbluetooth-private.la
 
-test_scotest_LDADD = lib/libbluetooth-private.la
-
 test_lmptest_LDADD = lib/libbluetooth-private.la
 
 test_bdaddr_SOURCES = test/bdaddr.c src/oui.h src/oui.c
diff --git a/test/scotest.c b/tools/scotest.c
similarity index 100%
rename from test/scotest.c
rename to tools/scotest.c