diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2081b02338..70d1eb110e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -150,20 +150,6 @@ aliases:
       command: |
         sudo --preserve-env=CIRCLECI mispipe "/tmp/production-upgrade-pg 2>&1" ts
 
-  - &check_xenial_provision_error
-    run:
-      name: check tools/provision error message on xenial
-      command: |
-        { { ! tools/provision 2>&1 >&3; } | tee provision.err; } 3>&1 >&2
-        grep -Fqx 'Error: ubuntu 16.04 is no longer a supported platform for Zulip.' provision.err
-
-  - &check_xenial_upgrade_error
-    run:
-      name: check scripts/lib/upgrade-zulip-stage-2 error message on xenial
-      command: |
-        { { ! sudo scripts/lib/upgrade-zulip-stage-2 2>&1 >&3; } | tee upgrade.err; } 3>&1 >&2
-        grep -Fq 'upgrade-zulip-stage-2: Unsupported platform: ubuntu 16.04' upgrade.err
-
   - &notify_failure_status
     run:
       name: On fail
@@ -243,19 +229,6 @@ jobs:
           command: mispipe "tools/ci/setup-backend" ts
       - *notify_failure_status
 
-  "xenial-legacy":
-    docker:
-      - image: arpit551/circleci:xenial-python-test
-
-    working_directory: ~/zulip
-
-    steps:
-      - checkout
-
-      - *check_xenial_provision_error
-      - *check_xenial_upgrade_error
-      - *notify_failure_status
-
   "bionic-production-build":
     docker:
       # This is built from tools/ci/images/bionic/Dockerfile .
@@ -348,9 +321,6 @@ jobs:
 
 workflows:
   version: 2
-  "Ubuntu 16.04 Xenial (Python 3.5, legacy)":
-    jobs:
-      - "xenial-legacy"
   "Ubuntu 18.04 Bionic (Python 3.6, backend+frontend)":
     jobs:
       - "bionic-backend-frontend"
diff --git a/.github/workflows/legacy-os.yml b/.github/workflows/legacy-os.yml
new file mode 100644
index 0000000000..0b3f2a3443
--- /dev/null
+++ b/.github/workflows/legacy-os.yml
@@ -0,0 +1,18 @@
+name: Legacy OS
+
+on: [push, pull_request]
+
+jobs:
+  xenial:
+    name: Ubuntu 16.04 Xenial (Python 3.5, legacy)
+    runs-on: ubuntu-16.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Check tools/provision error message on xenial
+        run: |
+          { { ! tools/provision 2>&1 >&3; } | tee provision.err; } 3>&1 >&2
+          grep -Fqx 'Error: ubuntu 16.04 is no longer a supported platform for Zulip.' provision.err
+      - name: Check scripts/lib/upgrade-zulip-stage-2 error message on xenial
+        run: |
+          { { ! sudo scripts/lib/upgrade-zulip-stage-2 2>&1 >&3; } | tee upgrade.err; } 3>&1 >&2
+          grep -Fq 'upgrade-zulip-stage-2: Unsupported platform: ubuntu 16.04' upgrade.err