diff --git a/.github/workflows/test_xtra.yml b/.github/workflows/test_xtra.yml
new file mode 100644
index 00000000..bfa7b029
--- /dev/null
+++ b/.github/workflows/test_xtra.yml
@@ -0,0 +1,47 @@
+name: Xtra-Tests
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - "utils/**"
+      - "doc/**"
+      - "docker/**"
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - "utils/**"
+      - "doc/**"
+      - "docker/**"
+  schedule:
+    - cron: "0 5 * * *"
+
+jobs:
+  build:
+    name: Run xtra tests
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby 2.x
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: "2.7"
+      - name: Set up Rust nightly
+        run: |
+          rm rust-toolchain
+          rustup self update
+          rustup toolchain install nightly --component llvm-tools-preview
+          rustup default nightly
+          rustup target add aarch64-unknown-none-softfloat
+          cargo install cargo-binutils
+      - name: Set up Ruby
+        run: |
+          gem install bundler
+          bundle config set without 'uart'
+          bundle install --retry 3
+      - name: Make all
+        run: |
+          bundle exec ruby utils/devtool.rb test_xtra
diff --git a/06_uart_chainloader/Makefile b/06_uart_chainloader/Makefile
index 6805ed1c..a8d38ffc 100644
--- a/06_uart_chainloader/Makefile
+++ b/06_uart_chainloader/Makefile
@@ -70,7 +70,7 @@ DOCKER_ARG_DIR_UTILS = -v $(shell pwd)/../utils:/work/utils
 DOCKER_ARG_DEV       = --privileged -v /dev:/dev
 
 DOCKER_QEMU  = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
-DOCKER_TEST  = $(DOCKER_CMD_INTERACT) $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
+DOCKER_TEST  = $(DOCKER_CMD) -t $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
 DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
 
 # Dockerize commands that require USB device passthrough only on Linux
diff --git a/06_uart_chainloader/README.md b/06_uart_chainloader/README.md
index ba6fc0c1..44fc1028 100644
--- a/06_uart_chainloader/README.md
+++ b/06_uart_chainloader/README.md
@@ -157,7 +157,7 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile
  DOCKER_ARG_DEV       = --privileged -v /dev:/dev
 
  DOCKER_QEMU  = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
-+DOCKER_TEST  = $(DOCKER_CMD_INTERACT) $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
++DOCKER_TEST  = $(DOCKER_CMD) -t $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
  DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
 
  # Dockerize commands that require USB device passthrough only on Linux
diff --git a/07_timestamps/README.md b/07_timestamps/README.md
index aa6d237c..88b82908 100644
--- a/07_timestamps/README.md
+++ b/07_timestamps/README.md
@@ -82,7 +82,7 @@ diff -uNr 06_uart_chainloader/Makefile 07_timestamps/Makefile
  DOCKER_ARG_DEV       = --privileged -v /dev:/dev
 
  DOCKER_QEMU  = $(DOCKER_CMD_INTERACT) $(DOCKER_IMAGE)
--DOCKER_TEST  = $(DOCKER_CMD_INTERACT) $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
+-DOCKER_TEST  = $(DOCKER_CMD) -t $(DOCKER_ARG_DIR_UTILS) $(DOCKER_IMAGE)
  DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE)
 
  # Dockerize commands that require USB device passthrough only on Linux