diff --git a/Makefile.tools b/Makefile.tools
index 23754a6..fdc0dec 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -204,7 +204,7 @@ EXTRA_DIST += test/sap_client.py test/hsplay test/hsmicro \
 		test/test-discovery test/test-manager test/test-adapter \
 		test/test-device test/test-service test/test-network \
 		test/simple-agent test/simple-service test/simple-endpoint \
-		test/test-input test/test-sap-server \
+		test/test-sap-server \
 		test/test-oob test/test-attrib test/test-proximity \
 		test/test-thermometer test/test-profile test/test-health \
 		test/test-health-sink test/service-record.dtd \
diff --git a/test/test-input b/test/test-input
deleted file mode 100755
index 110cbef..0000000
--- a/test/test-input
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/python
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-import sys
-import dbus
-from optparse import OptionParser, make_option
-
-bus = dbus.SystemBus()
-
-manager = dbus.Interface(bus.get_object("org.bluez", "/"), "org.bluez.Manager")
-
-option_list = [
-		make_option("-i", "--device", action="store",
-				type="string", dest="dev_id"),
-		]
-parser = OptionParser(option_list=option_list)
-
-(options, args) = parser.parse_args()
-
-if options.dev_id:
-	adapter_path = manager.FindAdapter(options.dev_id)
-else:
-	adapter_path = manager.DefaultAdapter()
-
-adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
-							"org.bluez.Adapter")
-
-if len(args) < 2:
-	print("""Usage: %s <command>
-
-	connect <bdaddr>
-	disconnect <bdaddr>
-	""" % sys.argv[0])
-	sys.exit(1)
-
-device = adapter.FindDevice(args[1])
-input = dbus.Interface(bus.get_object("org.bluez", device),
-				"org.bluez.Input")
-
-if args[0] == "connect":
-	input.Connect()
-elif args[0] == "disconnect":
-	input.Disconnect()
-else:
-	print("Unknown command")
-	sys.exit(1)