diff --git a/Makefile.am b/Makefile.am
index 159c13c4..17797ae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -409,7 +409,8 @@ test_scripts = test/backtrace \
 		test/unlock-pin \
 		test/enable-gprs \
 		test/disable-gprs \
-		test/get-icon
+		test/get-icon \
+		test/deactivate-all
 
 if TEST
 testdir = $(pkglibdir)/test
diff --git a/test/deactivate-all b/test/deactivate-all
new file mode 100755
index 00000000..427009e8
--- /dev/null
+++ b/test/deactivate-all
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+
+import sys
+import dbus
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+						'org.ofono.Manager')
+
+modems = manager.GetModems()
+
+for path, properties in modems:
+	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
+		continue
+
+	connman = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.ConnectionManager')
+
+	connman.DeactivateAll()