diff --git a/.travis.yml b/.travis.yml
index bcda3b5915..c7723178e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,31 +42,33 @@ script:
         fi
         popd
       fi
+    elif [ "$TEST_TYPE" = build ]; then
+      if [ "$SERVER" ]; then
+        set -e
+        ./node_modules/.bin/grunt build
+        curl \
+          -F "react=@build/react.js" \
+          -F "react.min=@build/react.min.js" \
+          -F "transformer=@build/JSXTransformer.js" \
+          -F "react-with-addons=@build/react-with-addons.js" \
+          -F "react-with-addons.min=@build/react-with-addons.min.js" \
+          -F "npm-react=@build/packages/react.tgz" \
+          -F "npm-react-dom=@build/packages/react-dom.tgz" \
+          -F "npm-react-codemod=@build/packages/react-codemod.tgz" \
+          -F "commit=$TRAVIS_COMMIT" \
+          -F "date=`git log --format='%ct' -1`" \
+          -F "pull_request=$TRAVIS_PULL_REQUEST" \
+          -F "token=$SECRET_TOKEN" \
+          -F "branch=$TRAVIS_BRANCH" \
+          $SERVER
+      fi
     else
       ./node_modules/.bin/grunt $TEST_TYPE
     fi
-after_script:
-- |
-    if [ "$TEST_TYPE" = test ] && [ "$SERVER" ]; then
-      ./node_modules/.bin/grunt build
-      curl \
-        -F "react=@build/react.js" \
-        -F "react.min=@build/react.min.js" \
-        -F "transformer=@build/JSXTransformer.js" \
-        -F "react-with-addons=@build/react-with-addons.js" \
-        -F "react-with-addons.min=@build/react-with-addons.min.js" \
-        -F "npm-react=@build/react.tgz" \
-        -F "npm-react-tools=@build/react-tools.tgz" \
-        -F "commit=$TRAVIS_COMMIT" \
-        -F "date=`git log --format='%ct' -1`" \
-        -F "pull_request=$TRAVIS_PULL_REQUEST" \
-        -F "token=$SECRET_TOKEN" \
-        -F "branch=$TRAVIS_BRANCH" \
-        $SERVER
-    fi
 env:
   matrix:
   - TEST_TYPE=test
+  - TEST_TYPE=build
   - TEST_TYPE=jest
   - TEST_TYPE=lint
   - TEST_TYPE=build_website