diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78be52c8aba3570de512c08359d12d6621810bc7..520cc08b14008bce90a76dfcdd57887092468c8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,19 +5,6 @@ variables:
   MYSQL_ROOT_PASSWORD: root
   BOKEH_HTML_VALIDATOR_URL: "http://sthysel__nuhtml:8888"
 
-test:php74_bokeh:
-  image: bokeh_php74_with_chrome
-  services:
-    - localhost:5000/bokeh_mariadb_10.3
-    - sthysel/nuhtml
-  script:
-    - bash scripts/ci_data_preparation.sh $MYSQL_DATABASE $MYSQL_HOST $MYSQL_ROOT_PASSWORD
-    - bash build_bokeh.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD $MYSQL_HOST
-  except:
-    - tags
-  tags:
-    - bladerunner
-
 
 test:php74_other:
   image: bokeh_php74_with_chrome
@@ -47,20 +34,6 @@ test:php74_scenario:
     - bladerunner
     
 
-test:php81_bokeh:
-  image: bokeh_php81
-  services:
-    - localhost:5000/bokeh_mariadb_10.3
-    - sthysel/nuhtml
-  script:
-    - bash scripts/ci_data_preparation.sh $MYSQL_DATABASE $MYSQL_HOST $MYSQL_ROOT_PASSWORD
-    - bash build_bokeh.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD $MYSQL_HOST
-  except:
-    - tags
-  tags:
-    - bladerunner
-
-
 test:php81_other:
   image: bokeh_php81
   services:
diff --git a/build_other.sh b/build_other.sh
index 8ec7a8ee952a38f246fa03ed18949966f7ddf16a..0f8514cfe5663a65af742ceb0534cdd127f78e8e 100644
--- a/build_other.sh
+++ b/build_other.sh
@@ -8,6 +8,9 @@ source ./build_bokeh_config.sh $DBNAME $DBUSER $DBPASS $DBHOST
 
 EARLY_DESC=`php -r "echo version_compare(PHP_VERSION, '8.1', '>=') ? '--fail-error-with-desc' : '';"`
 
+phpunit -c tests/phpunit.xml --list-suites $EARLY_DESC \
+    && phpunit -c tests/phpunit.xml --exclude-group no-ci $EARLY_DESC
+
 phpunit -c tests/phpunit_eco.xml --list-suites $EARLY_DESC \
     && phpunit -c tests/phpunit_eco.xml $EARLY_DESC \
     && phpunit -c tests/phpunit_db.xml --list-suites $EARLY_DESC \