diff --git a/.travis.yml b/.travis.yml
index 574b21c5..5a9f9ddc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,8 @@ script: make $TEST_SUITE
 # 3.1 cluster startup is not always a success, causing lots of false positive.
 matrix:
   allow_failures:
-    - env: TEST_SUITE=run-tests-local-process ARANGODB=arangodb:3.1
-    - env: TEST_SUITE=run-tests-docker        ARANGODB=arangodb:3.1
+    - env: TEST_SUITE=run-tests-local-process ARANGODB=arangodb:3.1 STARTER_MODES="single,cluster"
+    - env: TEST_SUITE=run-tests-docker        ARANGODB=arangodb:3.1 STARTER_MODES="single,cluster"
 
 # Install Docker CE
 before_install:
diff --git a/service/arangod_config_builder.go b/service/arangod_config_builder.go
index 46b4cc23..6f9229d8 100644
--- a/service/arangod_config_builder.go
+++ b/service/arangod_config_builder.go
@@ -229,7 +229,6 @@ func createArangodArgs(log *logging.Logger, config Config, clusterConfig Cluster
 		options = append(options,
 			optionPair{"--cluster.my-address", myTCPURL},
 			optionPair{"--cluster.my-role", "PRIMARY"},
-			optionPair{"--cluster.my-local-info", myTCPURL},
 			optionPair{"--foxx.queues", "false"},
 			optionPair{"--server.statistics", "true"},
 		)
@@ -237,7 +236,6 @@ func createArangodArgs(log *logging.Logger, config Config, clusterConfig Cluster
 		options = append(options,
 			optionPair{"--cluster.my-address", myTCPURL},
 			optionPair{"--cluster.my-role", "COORDINATOR"},
-			optionPair{"--cluster.my-local-info", myTCPURL},
 			optionPair{"--foxx.queues", "true"},
 			optionPair{"--server.statistics", "true"},
 		)
diff --git a/service/passthrough.go b/service/passthrough.go
index 5acd77d5..fec20e5e 100644
--- a/service/passthrough.go
+++ b/service/passthrough.go
@@ -45,7 +45,6 @@ var (
 		"cluster.agency-endpoint",
 		"cluster.my-address",
 		"cluster.my-role",
-		"cluster.my-local-info",
 		"database.directory",
 		"javascript.startup-directory",
 		"javascript.app-path",