diff --git a/riak_test/src/rtcs_config.erl b/riak_test/src/rtcs_config.erl
index 7f5ac3fec..8eacd2520 100644
--- a/riak_test/src/rtcs_config.erl
+++ b/riak_test/src/rtcs_config.erl
@@ -383,7 +383,14 @@ update_admin_creds(Config, AdminKey) ->
      proplists:delete(admin_key, Config)].
 
 update_cs_port(Config, N) ->
-    Config2 = [{riak_host, {"127.0.0.1", pb_port(N)}} | proplists:delete(riak_host, Config)],
+    PBPort = case rt_config:get(flavor, basic) of
+                 basic -> pb_port(N);
+                 {multibag, _} ->
+                     %% dev1 is the master cluster, so all CS nodes
+                     %% are configured as that
+                     pb_port(1)
+             end,
+    Config2 = [{riak_host, {"127.0.0.1", PBPort}} | proplists:delete(riak_host, Config)],
     [{listener, {"127.0.0.1", cs_port(N)}} | proplists:delete(listener, Config2)].
 
 update_stanchion_config(Prefix, Config, {AdminKey, _AdminSecret}) ->