diff --git a/Makefile.am b/Makefile.am
index 264b3a70..aa106080 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,7 +142,8 @@ test_files = test/test-manager test/test-modem test/test-voicecall \
 		test/test-advice-of-charge test/test-call-settings \
 		test/test-call-forwarding test/test-call-barring \
 		test/test-ss-control-cb test/test-ss-control-cf \
-		test/test-ss-control-cs
+		test/test-ss-control-cs \
+		test/list-modems test/enable-modem
 
 EXTRA_DIST = src/genbuiltin src/ofono.conf $(doc_files) $(test_files)
 
diff --git a/test/enable-modem b/test/enable-modem
new file mode 100755
index 00000000..0f9f604f
--- /dev/null
+++ b/test/enable-modem
@@ -0,0 +1,17 @@
+#!/usr/bin/python
+
+import dbus
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+						'org.ofono.Manager')
+
+properties = manager.GetProperties()
+
+path = properties["Modems"][0]
+
+modem = dbus.Interface(bus.get_object('org.ofono', path),
+						'org.ofono.Modem')
+
+modem.SetProperty("Powered", dbus.Boolean(1))
diff --git a/test/list-modems b/test/list-modems
new file mode 100755
index 00000000..597614be
--- /dev/null
+++ b/test/list-modems
@@ -0,0 +1,46 @@
+#!/usr/bin/python
+
+import dbus
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+						'org.ofono.Manager')
+
+properties = manager.GetProperties()
+
+for path in properties["Modems"]:
+	modem = dbus.Interface(bus.get_object('org.ofono', path),
+							'org.ofono.Modem')
+
+	properties = modem.GetProperties()
+
+	print "[ %s ]" % (path)
+
+	for key in properties.keys():
+		if key in ["Interfaces"]:
+			val = ""
+			for i in properties[key]:
+				val += i + " "
+		else:
+			val = str(properties[key])
+		print "    %s = %s" % (key, val)
+
+	for interface in properties["Interfaces"]:
+		object = dbus.Interface(bus.get_object('org.ofono', path),
+								interface)
+
+		properties = object.GetProperties()
+
+		print "    [ %s ]" % (interface)
+
+		for key in properties.keys():
+			if key in ["AvailableOperators"]:
+				val = ""
+				for i in properties[key]:
+					val += i + " "
+			else:
+				val = str(properties[key])
+			print "        %s = %s" % (key, val)
+	
+	print