diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f50521fc..abf225635 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -102,7 +102,8 @@ jobs:
       - *restore_repo
       - run:
           name: Test with Node 8
-          command: yarn run test
+          command: yarn test
+          command: yarn test:func
 
   test_node9:
     <<: *defaults
@@ -111,7 +112,8 @@ jobs:
       - *restore_repo
       - run:
           name: Test with Node 9
-          command: yarn run test
+          command: yarn test
+          command: yarn test:func
       - save_cache:
           key: *coverage_key
           paths:
@@ -125,6 +127,7 @@ jobs:
       - run:
           name: Test with Node 10
           command: yarn run test
+          command: yarn test:func
 
   test_e2e:
     <<: *defaults
diff --git a/package.json b/package.json
index 6bb279a72..c6bc642eb 100644
--- a/package.json
+++ b/package.json
@@ -154,11 +154,11 @@
     "prepublish": "in-publish && npm run build:webui && npm run code:build || not-in-publish",
     "flow": "flow",
     "pretest": "npm run code:build",
-    "test": "cross-env npm run test:unit && npm run test:func",
+    "test": "npm run test:unit",
     "test:unit": "cross-env NODE_ENV=test BABEL_ENV=test TZ=UTC jest --config ./jest.config.unit.js",
     "test:func": "cross-env NODE_ENV=testOldEnv jest --config ./test/jest.config.func.js --testPathPattern ./test/functional/index*",
     "test:e2e": "cross-env BABEL_ENV=testOldEnv jest --config ./test/jest.config.e2e.js",
-    "test:all": "npm run test && npm run test:e2e",
+    "test:all": "npm run test && npm run test:func && npm run test:e2e",
     "pre:ci": "npm run lint && npm run build:webui",
     "commitmsg": "commitlint -e $GIT_PARAMS",
     "coverage:publish": "codecov",