diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ca6df2f7be72368054d22a1d541f6abd754b56b..ffe0a5a2db4a8b3d213656e56e6ac287a102c0be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,3 +37,8 @@ simple_ros_noetic_test:
   extends: .simple_ros_test
   variables:
     TEMPLATE_TO_USE: ci-templates/auto-rules/noetic-default.yml
+
+simple_ros_core_with_noetic_test:
+  extends: .simple_ros_test
+  variables:
+    TEMPLATE_TO_USE: test/core_with_noetic.yml
diff --git a/test/core_with_noetic.yml b/test/core_with_noetic.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ce063ed55bc62ed643bddd27a45f9359ac3af735
--- /dev/null
+++ b/test/core_with_noetic.yml
@@ -0,0 +1,11 @@
+include: ci-templates/core.yml
+
+industrial_ci_melodic:
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: melodic
+
+industrial_ci_noetic:
+  extends: .industrial_ci
+  variables:
+    ROS_DISTRO: noetic