diff --git a/test/test-adapter b/test/test-adapter
index 00ef6f5..762ef98 100755
--- a/test/test-adapter
+++ b/test/test-adapter
@@ -29,6 +29,7 @@ if (len(args) < 1):
 	print "Usage: %s <command>" % (sys.argv[0])
 	print ""
 	print "  address"
+	print "  list"
 	print "  name [name]"
 	print "  powered [on/off]"
 	print "  pairable [on/off]"
@@ -51,6 +52,22 @@ if (args[0] == "name"):
 		adapter.SetProperty("Name", args[1])
 	sys.exit(0)
 
+if (args[0] == "list"):
+	if (len(args) < 2):
+		properties = manager.GetProperties()
+		for adapter_path in properties["Adapters"]:
+			adapter = dbus.Interface(bus.get_object("org.bluez", adapter_path),
+								"org.bluez.Adapter")
+			prop = adapter.GetProperties()
+			print " [ %s ]" % (adapter_path)
+			for (key, value) in prop.iteritems():
+				if (key == "Class"):
+					print "    %s = 0x%06x" % (key, value)
+				else:
+					print "    %s = %s" % (key, value)
+			print
+	sys.exit(0)
+
 if (args[0] == "powered"):
 	if (len(args) < 2):
 		properties = adapter.GetProperties()