diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..47f7ad9b1
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,27 @@
+version: 2.1
+jobs:
+  test-local-gcc:
+    machine:
+      image: ubuntu-2004:202010-01
+    working_directory: ~/criu
+    steps:
+      - checkout
+      - run:
+          name: "Test local with GCC"
+          command: sudo -E make -C scripts/ci local
+  test-local-clang:
+    machine:
+      image: ubuntu-2004:202010-01
+    working_directory: ~/criu
+    steps:
+      - checkout
+      - run:
+          name: "Test local with CLANG"
+          command: sudo -E make -C scripts/ci local CLANG=1
+
+workflows:
+  version: 2
+  builds:
+    jobs:
+      - test-local-gcc
+      - test-local-clang
diff --git a/.travis.yml b/.travis.yml
index a82ed910c..a94eb5edb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,17 +5,11 @@ cache: ccache
 services:
   - docker
 env:
-  - TR_ARCH=local
-  - TR_ARCH=local       CLANG=1
   - TR_ARCH=local       COMPAT_TEST=y
   - TR_ARCH=local       CLANG=1 COMPAT_TEST=y
   - TR_ARCH=vagrant-fedora-no-vdso
 jobs:
   include:
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=local
-      dist: focal
     - os: linux
       arch: ppc64le
       env: TR_ARCH=local
diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh
index 648d5886c..42062aee9 100755
--- a/scripts/ci/run-ci-tests.sh
+++ b/scripts/ci/run-ci-tests.sh
@@ -97,6 +97,12 @@ test_stream() {
 
 ci_prep
 
+if [ "$CLANG" = "1" ]; then
+	# Needed for clang on Circle CI
+	LDFLAGS="$LDFLAGS -Wl,-z,now"
+	export LDFLAGS
+fi
+
 export GCOV
 $CC --version
 time make CC="$CC" -j4
@@ -204,7 +210,7 @@ if [ -z "$SKIP_EXT_DEV_TEST" ]; then
 fi
 #make -C test/others/exec/ run
 make -C test/others/make/ run CC="$CC"
-if [ -n "$TRAVIS" ]; then
+if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then
        # GitHub Actions does not provide a real TTY and CRIU will fail with:
        # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting
        make -C test/others/shell-job/ run