diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000000..8c63b149949bf
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,23 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: linuxbrew/linuxbrew
+    environment:
+      CIRCLE_REPOSITORY_URL: https://github.com/linuxbrew/brew
+      HOMEBREW_DEVELOPER: 1
+      HOMEBREW_NO_AUTO_UPDATE: 1
+      HOMEBREW_VERBOSE: 1
+      HOMEBREW_VERBOSE_USING_DOTS: 1
+    steps:
+      - checkout
+      - run: git remote set-url origin $CIRCLE_REPOSITORY_URL
+      - run: if [ -e .git/shallow ]; then echo git fetch --unshallow; fi
+      - run: git config --global user.name LinuxbrewTestBot
+      - run: git config --global user.email testbot@linuxbrew.sh
+      - run: rm -rf /home/linuxbrew/.linuxbrew/Homebrew
+      - run: cp -a . /home/linuxbrew/.linuxbrew/Homebrew
+      - run: |
+          umask 022
+          PATH="/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:$PATH"
+          brew test-bot
diff --git a/.gitignore b/.gitignore
index f16326bd143ba..60d643c1d168f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,7 @@
 !/.travis.yml
 !/.codecov.yml
 !/.yardopts
-!/circle.yml
+!/.circleci/config.yml
 !/CODEOFCONDUCT.md
 !/CONTRIBUTING.md
 !/LICENSE.txt
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 33202cf1f9ba5..0000000000000
--- a/circle.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-machine:
-  environment:
-    HOMEBREW_DEVELOPER: 1
-    HOMEBREW_NO_AUTO_UPDATE: 1
-    HOMEBREW_NO_ANALYTICS: 1
-checkout:
-  post:
-    - if [ -e .git/shallow ]; then echo git fetch --unshallow; fi
-    - git config user.name LinuxbrewTestBot
-    - git config user.email testbot@linuxbrew.sh
-test:
-  override:
-    - umask 022;
-      PATH="$PWD/bin:$PWD/sbin:$PATH";
-      brew test-bot