diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a9d6ee29e..80ea6e012 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ variables:
   LOG_LEVEL: "-vv"
 
 before_script:
+  - ./tests/scripts/rebase.sh
   - /usr/bin/python -m pip install -r tests/requirements.txt
   - mkdir -p /.ssh
 
@@ -42,6 +43,7 @@ before_script:
   services:
     - docker:dind
   before_script:
+    - ./tests/scripts/rebase.sh
     - ./tests/scripts/testcases_prepare.sh
   script:
     - ./tests/scripts/testcases_run.sh
diff --git a/.gitlab-ci/shellcheck.yml b/.gitlab-ci/shellcheck.yml
index 7001963a6..a8d7230df 100644
--- a/.gitlab-ci/shellcheck.yml
+++ b/.gitlab-ci/shellcheck.yml
@@ -5,6 +5,7 @@ shellcheck:
   variables:
     SHELLCHECK_VERSION: v0.6.0
   before_script:
+    - ./tests/scripts/rebase.sh
     - curl --silent "https://storage.googleapis.com/shellcheck/shellcheck-"${SHELLCHECK_VERSION}".linux.x86_64.tar.xz" | tar -xJv
     - cp shellcheck-"${SHELLCHECK_VERSION}"/shellcheck /usr/bin/
     - shellcheck --version
diff --git a/.gitlab-ci/terraform.yml b/.gitlab-ci/terraform.yml
index 9f496d325..313de9638 100644
--- a/.gitlab-ci/terraform.yml
+++ b/.gitlab-ci/terraform.yml
@@ -3,6 +3,7 @@
 .terraform_install:
   extends: .job
   before_script:
+    - ./tests/scripts/rebase.sh
     # Set Ansible config
     - cp ansible.cfg ~/.ansible.cfg
     # Install Terraform
diff --git a/tests/scripts/rebase.sh b/tests/scripts/rebase.sh
new file mode 100755
index 000000000..9a0345b56
--- /dev/null
+++ b/tests/scripts/rebase.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euxo pipefail
+
+# Rebase on master to get latest changes
+git config user.email "ci@kubespray.io"
+git config user.name "CI"
+git pull --rebase origin master