diff --git a/test/test-profile b/test/test-profile
index 169196a..1818358 100755
--- a/test/test-profile
+++ b/test/test-profile
@@ -53,7 +53,7 @@ if __name__ == '__main__':
 					default="/foo/bar/profile"),
 			make_option("-n", "--name", action="store",
 					type="string", dest="name",
-					default="Test Profile"),
+					default=None),
 			make_option("-s", "--server",
 					action="store_const",
 					const="server", dest="role"),
@@ -80,14 +80,13 @@ if __name__ == '__main__':
 
 	mainloop = GObject.MainLoop()
 
-	if options.uuid == "hfp":
-		options.name = "HFP HandsFree"
-
 	opts = {
-			"Name" :	options.name,
 			"AutoConnect" :	options.auto_connect,
 		}
 
+	if (options.name):
+		opts["Name"] = options.name
+
 	if (options.role):
 		opts["Role"] = options.role