diff --git a/Makefile.am b/Makefile.am
index 821150c7..fdbf741b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -229,7 +229,8 @@ 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/receive-sms test/send-sms test/list-contexts \
+		test/create-context
 
 conf_files = src/ofono.conf plugins/modem.conf
 
diff --git a/test/create-context b/test/create-context
new file mode 100755
index 00000000..138efd15
--- /dev/null
+++ b/test/create-context
@@ -0,0 +1,37 @@
+#!/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"] == []):
+		path = connmgr.CreateContext()
+	else:
+		path = properties["PrimaryContexts"][0]
+
+	context = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.PrimaryDataContext')
+
+	context.SetProperty("AccessPointName", sys.argv[1])
+
+	print "Setting APN of %s to %s" % (path, sys.argv[1])