diff --git a/.circleci/config.yml b/.circleci/config.yml
index ace95d437..cfc1eb701 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,15 +92,19 @@ jobs:
       - checkout
       - run: npm install --no-package-lock
       - run: |
+          npm test -- --maxWorkers=2
           npm run lint
           npm run flow -- check
-          npm test -- --maxWorkers=2
-# eslint
+# eslint - doesn't run on non-PR builds
       - run:
           name: Analyze Code
           command: |
-            npm install github@0.2.4
-            cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; npm run flow --silent -- check --json) | GITHUB_TOKEN="af6ef0d15709bc91d""06a6217a5a826a226fb57b7" CI_USER=$CIRCLE_PROJECT_USERNAME CI_REPO=$CIRCLE_PROJECT_REPONAME PULL_REQUEST_NUMBER=$CIRCLE_PR_NUMBER node bots/code-analysis-bot.js
+            if [ -n "$CIRCLE_PR_NUMBER" ]; then
+              npm install github@0.2.4
+              cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; npm run flow --silent -- check --json) | GITHUB_TOKEN="af6ef0d15709bc91d""06a6217a5a826a226fb57b7" CI_USER=$CIRCLE_PROJECT_USERNAME CI_REPO=$CIRCLE_PROJECT_REPONAME PULL_REQUEST_NUMBER=$CIRCLE_PR_NUMBER node bots/code-analysis-bot.js
+            else 
+              echo "Skipping code analysis."
+            fi
 
   test-node-6:
     <<: *defaults
@@ -110,9 +114,9 @@ jobs:
       - checkout
       - run: npm install
       - run: |
+          npm test -- --maxWorkers=2
           npm run lint
           npm run flow -- check
-          npm test -- --maxWorkers=2
 
   test-node-4:
     <<: *defaults
@@ -122,10 +126,10 @@ jobs:
       - checkout
       - run: npm install
       - run: |
+          npm test -- --maxWorkers=2
           npm run lint
           npm run flow -- check
-          npm test -- --maxWorkers=2
-
+          
   test-website:
     <<: *defaults
     docker: