diff --git a/eessi/testsuite/tests/apps/gromacs.py b/eessi/testsuite/tests/apps/gromacs.py
index 7567cf85..d12e6a65 100644
--- a/eessi/testsuite/tests/apps/gromacs.py
+++ b/eessi/testsuite/tests/apps/gromacs.py
@@ -39,7 +39,7 @@
 
 
 @rfm.simple_test
-class GROMACS_EESSI(gromacs_check):
+class EESSI_GROMACS(gromacs_check):
     scale = parameter(SCALES.keys())
     valid_prog_environs = ['default']
     valid_systems = []
diff --git a/eessi/testsuite/tests/apps/osu.py b/eessi/testsuite/tests/apps/osu.py
index 4f6af605..bfcd6cb7 100644
--- a/eessi/testsuite/tests/apps/osu.py
+++ b/eessi/testsuite/tests/apps/osu.py
@@ -38,7 +38,7 @@ def filter_scales_coll():
 
 
 @rfm.simple_test
-class osu_pt_2_pt(osu_benchmark):
+class EESSI_OSU_Micro_Benchmarks_pt2pt(osu_benchmark):
     ''' Run-only OSU test '''
     scale = parameter(filter_scales_pt2pt())
     valid_prog_environs = ['default']
@@ -154,7 +154,7 @@ def set_num_gpus_per_node(self):
 
 
 @rfm.simple_test
-class osu_coll(osu_benchmark):
+class EESSI_OSU_Micro_Benchmarks_coll(osu_benchmark):
     ''' Run-only OSU test '''
     scale = parameter(filter_scales_coll())
     valid_prog_environs = ['default']
diff --git a/eessi/testsuite/tests/apps/tensorflow/tensorflow.py b/eessi/testsuite/tests/apps/tensorflow/tensorflow.py
index ee49d021..9f5bbdbb 100644
--- a/eessi/testsuite/tests/apps/tensorflow/tensorflow.py
+++ b/eessi/testsuite/tests/apps/tensorflow/tensorflow.py
@@ -11,7 +11,7 @@
 from eessi.testsuite.constants import *  # noqa
 
 @rfm.simple_test
-class TENSORFLOW_EESSI(rfm.RunOnlyRegressionTest):
+class EESSI_TensorFlow(rfm.RunOnlyRegressionTest):
 
     # This test can run at any scale, so parameterize over all known SCALES
     scale = parameter(SCALES.keys())