diff --git a/.circleci/config.yml b/.circleci/config.yml
index e9921d40..cd1e2cb1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,7 +51,7 @@ jobs:
       # for years without actual issue so disabling the pointer tests
       - run: go get -v -t -d ./...
       - run:
-          command: go test -gcflags=all=-d=checkptr=0 -race ./...
+          command: go test -timeout 20m -gcflags=all=-d=checkptr=0 -race ./...
           environment:
                 GORACE: "halt_on_error=1"
 
diff --git a/system_test/full_system_test.py b/system_test/full_system_test.py
index 1a892ba6..bc637865 100755
--- a/system_test/full_system_test.py
+++ b/system_test/full_system_test.py
@@ -954,6 +954,7 @@ class TestEndToEndSnapRestoreCluster(unittest.TestCase):
     # Restart killed node, check it has full state.
     self.n2.start()
     self.n2.wait_for_leader()
+    self.n2.wait_for_all_fsm()
     j = self.n2.query('SELECT count(*) FROM foo', level='none')
     self.assertEqual(str(j), "{u'results': [{u'values': [[400]], u'types': [u''], u'columns': [u'count(*)']}]}")