diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
index db74ac4d6a..ba42cffaa6 100644
--- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
+++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
@@ -11,7 +11,15 @@ easyconfigs:
   - R-bundle-CRAN-2023.12-foss-2023a.eb
   - OpenFOAM-10-foss-2023a.eb
   - PyOpenGL-3.1.7-GCCcore-12.3.0.eb
-  - ipympl-0.9.3-foss-2023a.eb
+  # replaced by ipympl-0.9.3-gfbf-2023a.eb
+  # - ipympl-0.9.3-foss-2023a.eb
+  - ipympl-0.9.3-gfbf-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20586
+        #     which removed the foss/2023a ec file
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18852
+        #     which added/updated the gfbf/2023a ec file
+        from-pr: 18852
   - SuperLU_DIST-8.1.2-foss-2023a.eb:
       options:
         from-pr: 20162
@@ -40,3 +48,7 @@ easyconfigs:
       options:     
         from-pr: 20540
   - WhatsHap-2.2-foss-2023a.eb
+  - GATK-4.5.0.0-GCCcore-12.3.0-Java-17.eb
+  - ESPResSo-4.2.2-foss-2023a.eb:
+      options:
+        from-pr: 20595
diff --git a/test_suite.sh b/test_suite.sh
index f213ad68a3..2f304dd9bc 100755
--- a/test_suite.sh
+++ b/test_suite.sh
@@ -183,7 +183,16 @@ else
 fi
 
 # List the tests we want to run
-export REFRAME_ARGS='--tag CI --tag 1_node --nocolor --exclude=TensorFlow'
+# export REFRAME_ARGS='--tag CI --tag 1_node --nocolor --exclude=TensorFlow'
+export REFRAME_FLAGS='--nocolor'
+export REFRAME_TAGS='--tag CI --tag 1_node'
+# Limit test names to relevant tests
+# For now, we limit to OSU.
+# In the future, we should create some mapping between module names of modules that are deployed.
+# E.g. if TensorFlow was deployed, we want to run with `-n TensorFlow`. If OpenMPI was deployed
+# we want to run with `-n OSU`, or maybe even `-n OSU -n GROMACS.*foss` to also test _one_ OpenMPI application
+export REFRAME_INCLUDE_PATTERNS='-n OSU'
+export REFRAME_ARGS="${REFRAME_FLAGS} ${REFRAME_TAGS} ${REFRAME_INCLUDE_PATTERNS}"
 echo "Listing tests: reframe ${REFRAME_ARGS} --list"
 reframe ${REFRAME_ARGS} --list
 if [[ $? -eq 0 ]]; then