diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 8f6f4db886f8a9673adca5fea688ed1bf77b4a80..ae09588c02ce7a3c481d03e64d64d8ad816f1400 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -6,6 +6,9 @@
   "os": "debian-etch",
   "mem": "512M",
 
+  "rapi-user": "foobar",
+  "rapi-pass": "barfoo",
+
   "# Lists of disk sizes": null,
   "disk": ["1G", "512M"],
   "disk-growth": ["2G", "768M"],
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 5c88a04e9fe3921a4bb600e972789f3d44d076c7..37d1c45a9c9aa6dea3d268200b12c16c63eaab75 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -79,6 +79,21 @@ def TestClusterInit():
   AssertEqual(StartSSH(master['primary'],
                        utils.ShellQuoteArgs(cmd)).wait(), 0)
 
+  # Create RAPI credentials
+  rapi_user = qa_config.get("rapi-user", default=None)
+  rapi_pass = qa_config.get("rapi-pass", default=None)
+
+  if rapi_user and rapi_pass:
+    cmds = []
+
+    cred_string = "%s %s write" % (rapi_user, rapi_pass)
+    cmds.append(("echo %s >> %s" %
+                 (utils.ShellQuote(cred_string),
+                  utils.ShellQuote(constants.RAPI_USERS_FILE))))
+    cmds.append("%s stop-master" % constants.DAEMON_UTIL)
+    cmds.append("%s start-master" % constants.DAEMON_UTIL)
+    AssertEqual(StartSSH(master['primary'], ' && '.join(cmds)).wait(), 0)
+
 
 def TestClusterRename():
   """gnt-cluster rename"""