diff --git a/Makefile.am b/Makefile.am
index d44c126f..4bb5303d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -233,8 +233,9 @@ test_files = test/test-manager test/test-modem test/test-voicecall \
 		test/test-ss-control-cs \
 		test/monitor-ofono test/list-modems test/enable-modem \
 		test/list-operators test/dial-number test/hangup-all \
-		test/receive-sms test/send-sms test/list-contexts \
-		test/create-context test/activate-context
+		test/receive-sms test/send-sms \
+		test/list-contexts test/create-context \
+		test/activate-context test/deactivate-context
 
 conf_files = src/ofono.conf plugins/modem.conf
 
diff --git a/test/deactivate-context b/test/deactivate-context
new file mode 100755
index 00000000..2e119219
--- /dev/null
+++ b/test/deactivate-context
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+
+import sys
+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()
+
+	if "org.ofono.DataConnectionManager" not in properties["Interfaces"]:
+		continue
+
+	connmgr = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.DataConnectionManager')
+
+	properties = connmgr.GetProperties()
+
+	if (properties["PrimaryContexts"] == []):
+		print "No context available"
+		sys.exit(1)
+
+	path = properties["PrimaryContexts"][0]
+
+	context = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.PrimaryDataContext')
+
+	context.SetProperty("Active", dbus.Boolean(0))