diff --git a/.circleci/config.yml b/.circleci/config.yml
index d95a390561d..212e4827565 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,7 +19,8 @@ references:
       - run: make build-linux "ARCH=$ARCH"
       - run: make lint
       - run: make vet
-      - run: make unit-test
+      # TODO: Enable architecture specific unit-test when Circle CI supports it!
+      - run: make unit-test ARCH=amd64
 
 jobs:
   build_x86_64: