diff --git a/test/list-contexts b/test/list-contexts
index f0731180..66a76c5c 100755
--- a/test/list-contexts
+++ b/test/list-contexts
@@ -17,20 +17,15 @@ for path in properties["Modems"]:
 
 	print "[ %s ]" % (path)
 
-	if "org.ofono.DataConnectionManager" not in properties["Interfaces"]:
+	if "org.ofono.ConnectionManager" not in properties["Interfaces"]:
 		continue
 
-	connmgr = dbus.Interface(bus.get_object('org.ofono', path),
-					'org.ofono.DataConnectionManager')
+	connman = dbus.Interface(bus.get_object('org.ofono', path),
+					'org.ofono.ConnectionManager')
 
-	properties = connmgr.GetProperties()
-
-	for path in properties["PrimaryContexts"]:
-		context = dbus.Interface(bus.get_object('org.ofono', path),
-					'org.ofono.PrimaryDataContext')
-
-		properties = context.GetProperties()
+	contexts = connman.GetContexts()
 
+	for path, properties in contexts:
 		print "    [ %s ]" % (path)
 
 		for key in properties.keys():
@@ -47,5 +42,5 @@ for path in properties["Modems"]:
 			else:
 				val = str(properties[key])
 			print "        %s = %s" % (key, val)
-	
+
 		print