diff --git a/cmd/rqbench/simple_load.sh b/cmd/rqbench/simple_load.sh
index 34857469..2acc28a9 100755
--- a/cmd/rqbench/simple_load.sh
+++ b/cmd/rqbench/simple_load.sh
@@ -16,7 +16,6 @@ handle_ctrl_c() {
 
 trap 'handle_ctrl_c' SIGINT
 
-
 $RQBENCH -o 'CREATE TABLE foo (id INTEGER NOT NULL PRIMARY KEY, name TEXT, surname TEXT)' -m 100 -n 500000 -a $EXECUTE_HOST 'INSERT INTO foo(name) VALUES("fiona")' &
 $RQBENCH -o 'CREATE TABLE bar (id INTEGER NOT NULL PRIMARY KEY, name TEXT, surname TEXT)' -m 100 -n 500000 -a $EXECUTE_HOST 'INSERT INTO bar(name, surname) VALUES("fiona", "OTOOLE")' &
 $RQBENCH -o 'CREATE TABLE qux (id INTEGER NOT NULL PRIMARY KEY, name TEXT)' -m 100 -n 500000 -a $EXECUTE_HOST 'INSERT INTO qux(name) VALUES("fionafionafionafionafionafionafionafionafionafionafionafionafionafionafionafionafionafiona")' &
diff --git a/system_test/e2e/auto_clustering.py b/system_test/e2e/auto_clustering.py
index 0ae585fe..43d30261 100644
--- a/system_test/e2e/auto_clustering.py
+++ b/system_test/e2e/auto_clustering.py
@@ -13,7 +13,7 @@ from helpers import Node, Cluster, d_, write_random_file, deprovision_node, rand
 
 RQLITED_PATH = os.environ['RQLITED_PATH']
 
-class TestBootstrapping(unittest.TestCase):
+class TestBootstrapping3To4Nodes(unittest.TestCase):
   '''Test simple bootstrapping works via -bootstrap-expect'''
   def test(self):
     n0 = Node(RQLITED_PATH, '0', bootstrap_expect=3)
@@ -40,6 +40,36 @@ class TestBootstrapping(unittest.TestCase):
     deprovision_node(n2)
     deprovision_node(n3)
 
+class TestBootstrapping5Nodes(unittest.TestCase):
+  '''Test simple bootstrapping works via -bootstrap-expect set to 5'''
+  def test(self):
+    bootstrapN=5
+    n0 = Node(RQLITED_PATH, '0', bootstrap_expect=bootstrapN)
+    n1 = Node(RQLITED_PATH, '1', bootstrap_expect=bootstrapN)
+    n2 = Node(RQLITED_PATH, '2', bootstrap_expect=bootstrapN)
+    n3 = Node(RQLITED_PATH, '3', bootstrap_expect=bootstrapN)
+    n4 = Node(RQLITED_PATH, '4', bootstrap_expect=bootstrapN)
+
+    joinNodes = [n0.APIProtoAddr(), n1.APIProtoAddr(), n2.APIProtoAddr(), n3.APIProtoAddr(), n4.APIProtoAddr()]
+
+    n0.start(join=','.join(joinNodes))
+    n1.start(join=','.join(joinNodes))
+    n2.start(join=','.join(joinNodes))
+    n3.start(join=','.join(joinNodes))
+    n4.start(join=','.join(joinNodes))
+
+    self.assertEqual(n0.wait_for_leader(), n1.wait_for_leader())
+    self.assertEqual(n0.wait_for_leader(), n2.wait_for_leader())
+    self.assertEqual(n0.wait_for_leader(), n3.wait_for_leader())
+    self.assertEqual(n0.wait_for_leader(), n4.wait_for_leader())
+    self.assertEqual(len(n0.nodes()), bootstrapN)
+
+    deprovision_node(n0)
+    deprovision_node(n1)
+    deprovision_node(n2)
+    deprovision_node(n3)
+    deprovision_node(n4)
+
 class TestBootstrappingRestart(unittest.TestCase):
   '''Test restarting a bootstrapped cluster works via -bootstrap-expect'''
   def test(self):