diff --git a/.circleci/config.yml b/.circleci/config.yml
index 53ecc6dd51..b934c6a098 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -109,6 +109,19 @@ jobs:
             make app-layers
             if [[ -n $(git status --porcelain) ]]; then echo "Please update the app layers using make app-layers"; exit 1; fi
 
+  check-store-layers:
+    docker:
+      - image: mattermost/mattermost-build-server:20200322_golang-1.14.1
+    working_directory: ~/mattermost
+    steps:
+      - attach_workspace:
+          at: ~/mattermost/
+      - run:
+          command: |
+            cd mattermost-server
+            make store-layers
+            if [[ -n $(git status --porcelain) ]]; then echo "Please update the store layers using make store-layers"; exit 1; fi
+
   build-api-spec:
     docker:
       - image: circleci/node:lts
@@ -406,12 +419,16 @@ workflows:
       - check-app-layers:
           requires:
             - setup
+      - check-store-layers:
+          requires:
+            - setup
       - build-api-spec:
           requires:
             - setup
       - build:
           requires:
             - check-app-layers
+            - check-store-layers
             - build-api-spec
       - upload-s3-sha:
           context: mattermost-ci-pr-builds-s3
@@ -431,12 +448,15 @@ workflows:
           dbsource: "mmuser:mostest@tcp(mysql:3306)/mattermost_test?charset=utf8mb4,utf8"
           requires:
             - check-app-layers
+            - check-store-layers
       - test:
           name: test-postgres
           dbdriver: postgres
           dbsource: "postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable&connect_timeout=10"
           requires:
             - check-app-layers
+            - check-store-layers
       - test-schema:
           requires:
             - check-app-layers
+            - check-store-layers