diff --git a/maxscale-system-test/mxs2043_select_for_update.cpp b/maxscale-system-test/mxs2043_select_for_update.cpp
index 952c91dc3..2b6c9e518 100644
--- a/maxscale-system-test/mxs2043_select_for_update.cpp
+++ b/maxscale-system-test/mxs2043_select_for_update.cpp
@@ -78,7 +78,7 @@ bool create_user(TestConnections& test, MYSQL* pMysql)
 
     drop_user(test, pMysql, true);
 
-    test.try_query(pMysql, "CREATE USER '%s' IDENTIFIED by '%s'", ZUSER, ZPASSWORD);
+    test.try_query(pMysql, "CREATE USER '%s'@'%%' IDENTIFIED by '%s'", ZUSER, ZPASSWORD);
     test.try_query(pMysql, "GRANT SELECT, UPDATE ON %s TO '%s'@'%%'", ZTABLE, ZUSER);
 
     return test.global_result == 0;
@@ -150,6 +150,8 @@ int main(int argc, char* argv[])
         if (create_user(test, pMysql))
         {
             int rv = test.repl->connect();
+	    test.repl->sync_slaves();
+
             test.expect(rv == 0, "Could not connect to MS.");
 
             if (rv == 0)