diff --git a/.travis.yml b/.travis.yml
index 0be9bc2e..6637feb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,6 @@ script:
 matrix:
   allow_failures:
     - go: tip
-    - env: zk_version=3.5.4-beta
   fast_finish: true
 
 env:
diff --git a/server_java.go b/server_java.go
index a706e7bf..2a6c400f 100644
--- a/server_java.go
+++ b/server_java.go
@@ -128,13 +128,14 @@ func (sc ServerConfig) Marshall(w io.Writer) error {
 	// TODO: allow setting this
 	fmt.Fprintln(w, "reconfigEnabled=true")
 	fmt.Fprintln(w, "4lw.commands.whitelist=*")
-	fmt.Fprintln(w, "standaloneEnabled=false")
 
 	if len(sc.Servers) < 2 {
 		// if we dont have more than 2 servers we just dont specify server list to start in standalone mode
 		// see https://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_InstallingSingleMode for more details.
 		return nil
 	}
+	// if we then have more than one server force it to be distributed
+	fmt.Fprintln(w, "standaloneEnabled=false")
 
 	for _, srv := range sc.Servers {
 		if srv.PeerPort <= 0 {