diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b630549a0c8ee4cdb62ca3b36182e7e82e933202..656454b45e9a1c38c6ddfcd38bb96b4995096a6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,6 +58,10 @@ variables:
   variables:
     EMPER_WORKER_STATS: 'true'
 
+.emper-userspace-rcu:
+  variables:
+    EMPER_USERSPACE_RCU: 'true'
+
 .release-build:
   variables:
     BUILDTYPE: release
@@ -105,3 +109,8 @@ test-with-stats:
   extends:
     - .test
     - .emper-worker-stats
+
+test-with-userspace-rcu:
+  extends:
+    - .test
+    - .emper-userspace-rcu
diff --git a/meson.build b/meson.build
index 7e7331d03768f8aaed6dfb94062853110a9268af..4bda5563ed2a3ebe80152fedf246cae4d7850ad0 100644
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@ run_target('iwyu',
 		   command: 'tools/check-iwyu')
 
 conf_data = configuration_data()
-option_urcu = get_option('userspace-rcu')
+option_urcu = get_option('userspace_rcu')
 conf_data.set('EMPER_LIBURCU', option_urcu)
 if option_urcu
 	liburcu_dep = dependency('liburcu')
diff --git a/meson_options.txt b/meson_options.txt
index 983904624b8500ecd34566f60f4b91a9875d2611..5f283147e0a5fcc70d680206d3411926213076a6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
 option(
-  'userspace-rcu',
+  'userspace_rcu',
   type: 'boolean',
   value: false,
   description: 'Allow EMPER fibers to use userspace RCU',