diff --git a/.circleci/config.yml b/.circleci/config.yml
index 584f8c111327e..c7ba1b6b1e7c5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,7 @@
-version: 2
+version: 2.1
+
+orbs:
+  win: circleci/windows@2.4.0
 
 aliases:
   - &docker
@@ -48,6 +51,9 @@ aliases:
           paths:
             - bundle-sizes.json
 
+  - &ms_windows_environment
+    JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+
 jobs:
   setup:
     docker: *docker
@@ -352,6 +358,38 @@ jobs:
             RELEASE_CHANNEL: experimental
           command: yarn test-build-prod --maxWorkers=2
 
+  test_ms_windows:
+    executor:
+      name: win/default
+    environment: *ms_windows_environment
+    steps:
+      - run:
+          # Fix line endings in Windows.
+          command: git config --global core.autocrlf input
+      - checkout
+      - restore_cache:
+          keys:
+            - v2-win-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
+            - v2-win-node-{{ arch }}-{{ .Branch }}-
+            - v2-win-node-{{ arch }}-
+      - run:
+          command: node --version
+      - run:
+          command: choco install yarn
+      - *run_yarn
+      - save_cache:
+          key: v2-win-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
+          paths:
+            - C:\Users\circleci\AppData\Local\Yarn
+      - run:
+          command: yarn lint
+      - run:
+          command: yarn build
+      - run:
+          command: yarn test
+      - run:
+          command: yarn prettier
+
 workflows:
   version: 2
   stable:
@@ -439,3 +477,9 @@ workflows:
       - test_fuzz:
           requires:
             - setup
+
+  ms_windows:
+    jobs:
+      - test_ms_windows
+
+
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 8191e610a95ff..0000000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-image: Visual Studio 2017
-
-# Fix line endings in Windows. (runs before repo cloning)
-init:
-  - git config --global core.autocrlf input
-
-environment:
-  JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-  matrix:
-    - nodejs_version: 10
-
-# Finish on first failed build
-matrix:
-  fast_finish: true
-
-platform:
-  - x64
-
-branches:
-  only:
-    - master
-
-# Disable Visual Studio build and deploy
-build: off
-deploy: off
-
-install:
-  - ps: Install-Product node $env:nodejs_version $env:platform
-  - yarn install --frozen-lockfile
-
-test_script:
-  - node --version
-  - yarn lint
-#  - yarn flow-ci
-  - yarn build
-  - yarn test
-  - yarn prettier
-
-cache:
- - node_modules
- - "%LOCALAPPDATA%/Yarn"