diff --git a/test/pagespeed_test.conf.template b/test/pagespeed_test.conf.template
index 030d3e143..37279067f 100644
--- a/test/pagespeed_test.conf.template
+++ b/test/pagespeed_test.conf.template
@@ -1221,7 +1221,7 @@ http {
     listen [::]:@@SECONDARY_PORT@@;
     server_name remote-config.example.com;
     pagespeed FileCachePath "@@SECONDARY_CACHE@@";
-    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/rcport1";
+    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/standard";
     pagespeed RemoteConfigurationTimeoutMs 1500;
   }
   server {
@@ -1229,7 +1229,8 @@ http {
     listen [::]:@@SECONDARY_PORT@@;
     server_name remote-config-partially-invalid.example.com;
     pagespeed FileCachePath "@@SECONDARY_CACHE@@";
-    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/rcport2";
+    pagespeed RemoteConfigurationUrl
+              "http://127.0.0.1:@@RCPORT@@/partly-invalid";
     pagespeed RemoteConfigurationTimeoutMs 1500;
   }
   server {
@@ -1237,7 +1238,7 @@ http {
     listen [::]:@@SECONDARY_PORT@@;
     server_name remote-config-invalid.example.com;
     pagespeed FileCachePath "@@SECONDARY_CACHE@@";
-    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/rcport3";
+    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/invalid";
     pagespeed RemoteConfigurationTimeoutMs 1500;
   }
   server {
@@ -1245,7 +1246,7 @@ http {
     listen [::]:@@SECONDARY_PORT@@;
     server_name remote-config-failed-fetch.example.com;
     pagespeed FileCachePath "@@SECONDARY_CACHE@@";
-    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/rcport5";
+    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/fail-future";
     pagespeed RemoteConfigurationTimeoutMs 1500;
   }
   server {
@@ -1253,7 +1254,7 @@ http {
     listen [::]:@@SECONDARY_PORT@@;
     server_name remote-config-slow-fetch.example.com;
     pagespeed FileCachePath "@@SECONDARY_CACHE@@";
-    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/rcport6";
+    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/timeout";
     pagespeed RemoteConfigurationTimeoutMs 1500;
   }
   server {
@@ -1261,7 +1262,7 @@ http {
     listen [::]:@@SECONDARY_PORT@@;
     server_name remote-config-experiment.example.com;
     pagespeed FileCachePath "@@SECONDARY_CACHE@@";
-    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/rcport7";
+    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/experiment";
     pagespeed RemoteConfigurationTimeoutMs 1500;
   }
   server {
@@ -1269,7 +1270,8 @@ http {
     listen [::]:@@SECONDARY_PORT@@;
     server_name remote-config-slightly-slow-fetch.example.com;
     pagespeed FileCachePath "@@SECONDARY_CACHE@@";
-    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/rcport8";
+    pagespeed RemoteConfigurationUrl
+              "http://127.0.0.1:@@RCPORT@@/slightly-slow";
     pagespeed RemoteConfigurationTimeoutMs 1500;
   }
   server {
@@ -1277,7 +1279,7 @@ http {
     listen [::]:@@SECONDARY_PORT@@;
     server_name remote-config-slightly-slow-expired-fetch.example.com;
     pagespeed FileCachePath "@@SECONDARY_CACHE@@";
-    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/rcport9";
+    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/slow-expired";
     pagespeed RemoteConfigurationTimeoutMs 1500;
   }
   server {
@@ -1285,7 +1287,7 @@ http {
     listen [::]:@@SECONDARY_PORT@@;
     server_name remote-config-forbidden.example.com;
     pagespeed FileCachePath "@@SECONDARY_CACHE@@";
-    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/rcport10";
+    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/forbidden";
     pagespeed RemoteConfigurationTimeoutMs 1500;
   }
   server {
@@ -1293,7 +1295,8 @@ http {
     listen [::]:@@SECONDARY_PORT@@;
     server_name remote-config-initially-forbidden.example.com;
     pagespeed FileCachePath "@@SECONDARY_CACHE@@";
-    pagespeed RemoteConfigurationUrl "http://127.0.0.1:@@RCPORT@@/rcport11";
+    pagespeed RemoteConfigurationUrl
+              "http://127.0.0.1:@@RCPORT@@/forbidden-once";
     pagespeed RemoteConfigurationTimeoutMs 1500;
   }