diff --git a/src/main.c b/src/main.c
index 34fb822..34745c8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -223,7 +223,7 @@ int main(int argc, char **argv)
 	g_print("Launching FprintObject\n");
 
 	/* Obtain a connection to the session bus */
-	fprintd_dbus_conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	fprintd_dbus_conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
 	if (fprintd_dbus_conn == NULL)
 		g_error("Failed to open connection to bus: %s", error->message);
 
diff --git a/tests/enroll.c b/tests/enroll.c
index 694968e..7e887a6 100644
--- a/tests/enroll.c
+++ b/tests/enroll.c
@@ -74,15 +74,13 @@ static void create_manager(void)
 {
 	GError *error = NULL;
 
-	connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
 	if (connection == NULL)
 		g_error("Failed to connect to session bus: %s", error->message);
 
-	manager = dbus_g_proxy_new_for_name_owner(connection,
+	manager = dbus_g_proxy_new_for_name(connection,
 		"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
-		"net.reactivated.Fprint.Manager", &error);
-	if (manager == NULL)
-		g_error("Failed to create proxy: %s", error->message);
+		"net.reactivated.Fprint.Manager");
 }
 
 static DBusGProxy *open_device(void)
diff --git a/tests/verify.c b/tests/verify.c
index ab3eec6..557abdb 100644
--- a/tests/verify.c
+++ b/tests/verify.c
@@ -100,15 +100,13 @@ static void create_manager(void)
 {
 	GError *error = NULL;
 
-	connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+	connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
 	if (connection == NULL)
 		g_error("Failed to connect to session bus: %s", error->message);
 
-	manager = dbus_g_proxy_new_for_name_owner(connection,
+	manager = dbus_g_proxy_new_for_name(connection,
 		"net.reactivated.Fprint", "/net/reactivated/Fprint/Manager",
-		"net.reactivated.Fprint.Manager", &error);
-	if (manager == NULL)
-		g_error("Failed to create proxy: %s", error->message);
+		"net.reactivated.Fprint.Manager");
 }
 
 static DBusGProxy *open_device(void)