diff --git a/Makefile.tools b/Makefile.tools
index df63cd1..c0ad7e5 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -196,7 +196,7 @@ endif
 test_scripts += test/sap_client.py test/bluezutils.py \
 		test/dbusdef.py test/monitor-bluetooth test/list-devices \
 		test/test-discovery test/test-manager test/test-adapter \
-		test/test-device test/test-service test/simple-agent \
+		test/test-device test/simple-agent \
 		test/simple-service test/simple-endpoint test/test-sap-server \
 		test/test-proximity \
 		test/test-thermometer test/test-profile test/test-health \
diff --git a/test/test-service b/test/test-service
deleted file mode 100755
index 09e351f..0000000
--- a/test/test-service
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/python
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-import sys
-import dbus
-import time
-from optparse import OptionParser, make_option
-import bluezutils
-
-bus = dbus.SystemBus()
-
-option_list = [
-		make_option("-i", "--device", action="store",
-				type="string", dest="dev_id"),
-		]
-parser = OptionParser(option_list=option_list)
-
-(options, args) = parser.parse_args()
-
-adapter_path = bluezutils.find_adapter(options.dev_id).object_path
-
-service = dbus.Interface(bus.get_object("org.bluez", adapter_path),
-						"org.bluez.Service")
-
-if (len(args) < 1):
-	print("Usage: %s <command>" % (sys.argv[0]))
-	print("")
-	print("  addrecord <file>")
-	sys.exit(1)
-
-if (args[0] == "addrecord"):
-	if (len(args) < 2):
-		print("Need file parameter")
-	else:
-		f = open(args[1])
-		record = f.read()
-		f.close()
-		handle = service.AddRecord(record)
-		print("0x%x" % (handle))
-		time.sleep(120)
-	sys.exit(0)
-
-print("Unknown command")
-sys.exit(1)