diff --git a/tests/enroll.c b/tests/enroll.c
index 7e887a6..1aa92a0 100644
--- a/tests/enroll.c
+++ b/tests/enroll.c
@@ -158,6 +158,16 @@ static void release_device(DBusGProxy *dev)
 		g_error("ReleaseDevice failed: %s", error->message);
 }
 
+static gboolean set_username(DBusGProxy *dev, const char *username)
+{
+	GError *error = NULL;
+	if (!net_reactivated_Fprint_Device_set_username(dev, username, &error)) {
+		g_error("SetUsename failed: %s", error->message);
+		return FALSE;
+	}
+	return TRUE;
+}
+
 int main(int argc, char **argv)
 {
 	GMainLoop *loop;
@@ -168,6 +178,10 @@ int main(int argc, char **argv)
 	create_manager();
 
 	dev = open_device();
+	if (argc == 2) {
+		if (set_username(dev, argv[1]) == FALSE)
+			return 1;
+	}
 	do_enroll(dev);
 	release_device(dev);
 	return 0;
diff --git a/tests/verify.c b/tests/verify.c
index f222690..fed0d4e 100644
--- a/tests/verify.c
+++ b/tests/verify.c
@@ -211,6 +211,16 @@ static void release_device(DBusGProxy *dev)
 		g_error("ReleaseDevice failed: %s", error->message);
 }
 
+static gboolean set_username(DBusGProxy *dev, const char *username)
+{
+	GError *error = NULL;
+	if (!net_reactivated_Fprint_Device_set_username(dev, username, &error)) {
+		g_error("SetUsename failed: %s", error->message);
+		return FALSE;
+	}
+	return TRUE;
+}
+
 int main(int argc, char **argv)
 {
 	GMainLoop *loop;
@@ -222,6 +232,10 @@ int main(int argc, char **argv)
 	create_manager();
 
 	dev = open_device();
+	if (argc == 2) {
+		if (set_username(dev, argv[1]) == FALSE)
+			return 1;
+	}
 	finger_num = find_finger(dev);
 	do_verify(dev, finger_num);
 	release_device(dev);