diff --git a/circle.yml b/circle.yml
index b7b0ef7ce..ddfe671a5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -46,6 +46,7 @@ test:
     - "test -z \"$SECRET_PASSWORD\" || (cd $SRCDIR/integration; ./gce.sh setup && eval $(./gce.sh hosts); ./setup.sh)":
         parallel: true
     - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; eval $(./gce.sh hosts); ./run_all.sh):
+        parallel: true
         timeout: 300
   post:
     - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh destroy):
diff --git a/integration/run_all.sh b/integration/run_all.sh
index 9c7bdc098..3c8de0d10 100755
--- a/integration/run_all.sh
+++ b/integration/run_all.sh
@@ -4,4 +4,4 @@ set -e
 
 . ./config.sh
 
-NO_SCHEDULER=1 ../tools/integration/run_all.sh "$@"
+../tools/integration/run_all.sh "$@"