diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc49880eb0..b9ec003c69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ stages:
 
 ### Runner Tag Templates
 
-# Note: FreeBSD runners extract the FreeBSD version to use from job name
+# Note: BSD runners extract the operating system version to use from job name
 
 .freebsd-amd64: &freebsd_amd64
   tags:
@@ -45,6 +45,11 @@ stages:
     - linux
     - i386
 
+.openbsd-amd64: &openbsd_amd64
+  tags:
+    - openbsd
+    - amd64
+
 ### Docker Image Templates
 
 # Alpine Linux
@@ -193,7 +198,7 @@ stages:
     - *setup_interfaces
     - *setup_softhsm
   script:
-    - ( cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1 )
+    - ( cd bin/tests/system && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1 )
     - test -s bin/tests/system/systests.output
   artifacts:
     untracked: true
@@ -763,6 +768,21 @@ unit:clang:freebsd12.0:amd64:
     - clang:freebsd12.0:amd64
   needs: ["clang:freebsd12.0:amd64"]
 
+# Jobs for Clang builds on OpenBSD 6.5 (amd64)
+
+clang:openbsd6.5:amd64:
+  variables:
+    CC: clang
+  <<: *openbsd_amd64
+  <<: *build_job
+
+system:clang:openbsd6.5:amd64:
+  <<: *openbsd_amd64
+  <<: *system_test_job
+  dependencies:
+    - clang:openbsd6.5:amd64
+  needs: ["clang:openbsd6.5:amd64"]
+
 # Jobs with libtool disabled
 
 nolibtool:sid:amd64: