diff --git a/Makefile.am b/Makefile.am
index 7e8f12c3..0c83775b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -624,6 +624,7 @@ test_scripts = test/backtrace \
 		test/test-gnss \
 		test/swap-calls \
 		test/release-and-answer \
+		test/release-and-swap \
 		test/hold-and-answer \
 		test/hangup-multiparty
 
diff --git a/test/release-and-swap b/test/release-and-swap
new file mode 100755
index 00000000..396e39d7
--- /dev/null
+++ b/test/release-and-swap
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+
+import dbus
+
+bus = dbus.SystemBus()
+
+manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+						'org.ofono.Manager')
+
+modems = manager.GetModems()
+
+for path, properties in modems:
+	print "[ %s ]" % (path)
+
+	if "org.ofono.VoiceCallManager" not in properties["Interfaces"]:
+		continue
+
+	mgr = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.VoiceCallManager')
+
+	mgr.ReleaseAndSwap()
+	break