diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
new file mode 100644
index 0000000000..597b48d7ff
--- /dev/null
+++ b/.github/workflows/unit-tests.yml
@@ -0,0 +1,25 @@
+name: Unit Tests
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    name: Run unit tests in containers
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python:
+          - python3.6
+          - python2.7
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Run tests @ ${{matrix.python}}
+        run: script -e -c /bin/bash -c 'TERM=xterm docker build -t leapp-tests -f utils/docker-tests/Dockerfile utils/docker-tests && PYTHON_VENV=${{matrix.python}}  docker run --rm -ti -v ${PWD}:/payload --env=PYTHON_VENV leapp-tests'
diff --git a/.travis.yml b/.travis.yml
index b363fd8ff6..477d006c1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,12 +15,6 @@ install:
 
 jobs:
   include:
-    - script:
-        - docker run --env CI=$CI --rm -ti -v ${PWD}:/payload --env=PYTHON_VENV leapp-tests
-      env: PYTHON_VENV=python2.7
-    - script:
-        - docker run --env CI=$CI --rm -ti -v ${PWD}:/payload --env=PYTHON_VENV leapp-tests
-      env: PYTHON_VENV=python3.6
     - stage: deploy
       script:
         - docker run --env CI=$CI --rm -ti -v ${PWD}:/payload --entrypoint "/bin/bash" leapp-tests -c "make install-deps && make dashboard_data"