diff --git a/cscs-checks/libraries/math/trilinos_compile_run.py b/cscs-checks/libraries/math/trilinos_compile_run.py
index 27a8247b30..9ac06534d5 100644
--- a/cscs-checks/libraries/math/trilinos_compile_run.py
+++ b/cscs-checks/libraries/math/trilinos_compile_run.py
@@ -6,7 +6,6 @@
 @rfm.parameterized_test(['static'], ['dynamic'])
 class TrilinosTest(rfm.RegressionTest):
     def __init__(self, linkage):
-        super().__init__()
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
                               'tiger:gpu']
         # NOTE: PrgEnv-cray in dynamic does not work because of CrayBug/809265
@@ -38,7 +37,7 @@ def __init__(self, linkage):
         self.maintainers = ['AJ', 'CB']
         self.tags = {'production', 'craype'}
 
-    def setup(self, partition, environ, **job_opts):
-        prgenv_flags = self.prgenv_flags[environ.name]
-        self.build_system.cxxflags = prgenv_flags
-        super().setup(partition, environ, **job_opts)
+    @rfm.run_before('compile')
+    def set_cxxflags(self):
+        flags = self.prgenv_flags[self.current_environ.name]
+        self.build_system.cxxflags = flags
diff --git a/cscs-checks/mch/g2g_meteoswiss_check.py b/cscs-checks/mch/g2g_meteoswiss_check.py
index e7c5457e9f..4a2ad88d8b 100644
--- a/cscs-checks/mch/g2g_meteoswiss_check.py
+++ b/cscs-checks/mch/g2g_meteoswiss_check.py
@@ -5,13 +5,9 @@
 @rfm.parameterized_test([1], [2])
 class G2GMeteoswissTest(rfm.RegressionTest):
     def __init__(self, g2g):
-        super().__init__()
         self.descr = 'G2G Meteoswiss check with G2G=%s' % g2g
         self.strict_check = False
         self.valid_systems = ['kesch:cn']
-
-        # FIXME: temporary workaround until the mvapich module is fixed;
-        #        'PrgEnv-gnu-c2sm-gpu' will be added later
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.exclusive_access = True
         self.modules = ['cmake']
diff --git a/cscs-checks/mch/gpu_direct_cuda.py b/cscs-checks/mch/gpu_direct_cuda.py
index 23ab0e93ca..de0cadac53 100644
--- a/cscs-checks/mch/gpu_direct_cuda.py
+++ b/cscs-checks/mch/gpu_direct_cuda.py
@@ -6,11 +6,8 @@
 @rfm.simple_test
 class GpuDirectCudaCheck(rfm.RegressionTest):
     def __init__(self):
-        super().__init__()
         self.descr = 'tests gpu-direct for CUDA'
         self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn', 'tiger:gpu']
-        # FIXME: temporary workaround until the mvapich module is fixed
-        #        'PrgEnv-gnu-c2sm-gpu' will be added later
         self.valid_prog_environs = ['PrgEnv-gnu']
         self.sourcepath = 'gpu_direct_cuda.cu'
         self.build_system = 'SingleSource'
diff --git a/cscs-checks/tools/profiling_and_debugging/perftools.py b/cscs-checks/tools/profiling_and_debugging/perftools.py
index b0a10d4251..5f79ff25a4 100644
--- a/cscs-checks/tools/profiling_and_debugging/perftools.py
+++ b/cscs-checks/tools/profiling_and_debugging/perftools.py
@@ -29,8 +29,8 @@ def __init__(self, lang):
             self.modules += ['craype-accel-nvidia60']
 
         self.build_system = 'Make'
-        # NOTE: Restrict concurrency to allow creation of Fortran modules
         if lang == 'F90':
+            # NOTE: Restrict concurrency to allow creation of Fortran modules
             self.build_system.max_concurrency = 1
 
         self.prgenv_flags = {
@@ -50,10 +50,6 @@ def __init__(self, lang):
                 'LIB=-lstdc++']
 
         self.executable = 'jacobi'
-        # NOTE: Reduce time limit because for PrgEnv-pgi even if the output
-        # is correct, the batch job uses all the time.
-        self.time_limit = (0, 5, 0)
-
         self.num_tasks = 3
         self.num_tasks_per_node = 3
         self.num_cpus_per_task = 4
@@ -94,8 +90,8 @@ def __init__(self, lang):
         self.maintainers = ['JG', 'MKr']
         self.tags = {'production', 'craype'}
 
-    def setup(self, environ, partition, **job_opts):
-        super().setup(environ, partition, **job_opts)
+    @rfm.run_before('compile')
+    def setflags(self):
         flags = self.prgenv_flags[self.current_environ.name]
         self.build_system.cflags = flags
         self.build_system.cxxflags = flags