diff --git a/cscs-checks/cuda/cuda_checks.py b/cscs-checks/cuda/cuda_checks.py
index 34c3fcb906..b5c26887c9 100644
--- a/cscs-checks/cuda/cuda_checks.py
+++ b/cscs-checks/cuda/cuda_checks.py
@@ -16,7 +16,7 @@ def __init__(self):
         self.sourcesdir = os.path.join(self.current_system.resourcesdir,
                                        'CUDA', 'essentials')
         if self.current_system.name == 'kesch':
-            self.modules = ['craype-accel-nvidia35']
+            self.modules = ['cudatoolkit/8.0.61']
         else:
             self.modules = ['craype-accel-nvidia60']
 
diff --git a/cscs-checks/microbenchmarks/osu/osu_tests.py b/cscs-checks/microbenchmarks/osu/osu_tests.py
index 287353c3d5..901d7412f6 100644
--- a/cscs-checks/microbenchmarks/osu/osu_tests.py
+++ b/cscs-checks/microbenchmarks/osu/osu_tests.py
@@ -2,10 +2,11 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.required_version('>=2.19')
+@rfm.required_version('>=2.16')
 @rfm.parameterized_test(['production'])
 class AlltoallTest(rfm.RegressionTest):
     def __init__(self, variant):
+        super().__init__()
         self.strict_check = False
         self.valid_systems = ['daint:gpu', 'dom:gpu']
         self.descr = 'Alltoall OSU microbenchmark'
@@ -50,10 +51,10 @@ def __init__(self, variant):
         }
 
 
-@rfm.required_version('>=2.19')
 @rfm.simple_test
 class FlexAlltoallTest(rfm.RegressionTest):
     def __init__(self):
+        super().__init__()
         self.valid_systems = ['daint:gpu', 'daint:mc',
                               'dom:gpu', 'dom:mc',
                               'kesch:cn', 'kesch:pn', 'leone:normal']
@@ -71,22 +72,14 @@ def __init__(self):
         self.num_tasks_per_node = 1
         self.num_tasks = 0
         self.sanity_patterns = sn.assert_found(r'^1048576', self.stdout)
-        self.perf_patterns = {
-            'latency': sn.extractsingle(r'^8\s+(?P<latency>\S+)',
-                                        self.stdout, 'latency', float)
-        }
-        self.reference = {
-            '*': {
-                'latency': (0, None, None, 'us')
-            },
-        }
         self.tags = {'diagnostic', 'ops', 'benchmark'}
 
 
-@rfm.required_version('>=2.19')
+@rfm.required_version('>=2.16')
 @rfm.parameterized_test(['small'], ['large'])
 class AllreduceTest(rfm.RegressionTest):
     def __init__(self, variant):
+        super().__init__()
         self.strict_check = False
         self.valid_systems = ['daint:gpu', 'daint:mc']
         if variant == 'small':
@@ -174,6 +167,7 @@ def __init__(self, num_tasks):
 
 class P2PBaseTest(rfm.RegressionTest):
     def __init__(self):
+        super().__init__()
         self.exclusive_access = True
         self.strict_check = False
         self.num_tasks = 2
@@ -198,7 +192,7 @@ def __init__(self):
         }
 
 
-@rfm.required_version('>=2.19')
+@rfm.required_version('>=2.16')
 @rfm.simple_test
 class P2PCPUBandwidthTest(P2PBaseTest):
     def __init__(self):
@@ -238,7 +232,7 @@ def __init__(self):
         self.tags |= {'monch_acceptance'}
 
 
-@rfm.required_version('>=2.19')
+@rfm.required_version('>=2.16')
 @rfm.simple_test
 class P2PCPULatencyTest(P2PBaseTest):
     def __init__(self):
@@ -278,7 +272,7 @@ def __init__(self):
         self.tags |= {'monch_acceptance'}
 
 
-@rfm.required_version('>=2.19')
+@rfm.required_version('>=2.16')
 @rfm.simple_test
 class G2GBandwidthTest(P2PBaseTest):
     def __init__(self):
@@ -312,13 +306,13 @@ def __init__(self):
             self.modules = ['craype-accel-nvidia60']
             self.variables = {'MPICH_RDMA_ENABLED_CUDA': '1'}
         elif self.current_system.name == 'kesch':
-            self.modules = ['craype-accel-nvidia35']
+            self.modules = ['cudatoolkit/8.0.61']
             self.variables = {'MV2_USE_CUDA': '1'}
 
         self.build_system.cppflags = ['-D_ENABLE_CUDA_']
 
 
-@rfm.required_version('>=2.19')
+@rfm.required_version('>=2.16')
 @rfm.simple_test
 class G2GLatencyTest(P2PBaseTest):
     def __init__(self):
@@ -352,7 +346,7 @@ def __init__(self):
             self.modules = ['craype-accel-nvidia60']
             self.variables = {'MPICH_RDMA_ENABLED_CUDA': '1'}
         elif self.current_system.name == 'kesch':
-            self.modules = ['craype-accel-nvidia35']
+            self.modules = ['cudatoolkit/8.0.61']
             self.variables = {'MV2_USE_CUDA': '1'}
 
         self.build_system.cppflags = ['-D_ENABLE_CUDA_']
diff --git a/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py b/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py
index 5a0efb20c6..8461fcecbd 100644
--- a/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py
+++ b/cscs-checks/tools/profiling_and_debugging/cuda_gdb.py
@@ -17,7 +17,7 @@ def __init__(self):
         self.executable = 'cuda-gdb cuda_gdb_check'
         if self.current_system.name == 'kesch':
             self.exclusive_access = True
-            self.modules = ['craype-accel-nvidia35']
+            self.modules = ['cudatoolkit/8.0.61']
         else:
             self.modules = ['craype-accel-nvidia60']
 
diff --git a/cscs-checks/tools/profiling_and_debugging/ddt.py b/cscs-checks/tools/profiling_and_debugging/ddt.py
index 493084843f..f0173ce46e 100644
--- a/cscs-checks/tools/profiling_and_debugging/ddt.py
+++ b/cscs-checks/tools/profiling_and_debugging/ddt.py
@@ -100,7 +100,7 @@ def __init__(self, lang, extension):
         self.system_modules = {
             'daint': ['craype-accel-nvidia60'],
             'dom': ['craype-accel-nvidia60'],
-            'kesch': ['craype-accel-nvidia35']
+            'kesch': ['cudatoolkit/8.0.61']
         }
         sysname = self.current_system.name
         self.modules += self.system_modules.get(sysname, [])
diff --git a/cscs-checks/tools/profiling_and_debugging/nvprof.py b/cscs-checks/tools/profiling_and_debugging/nvprof.py
index 927945ad48..df550d56b5 100644
--- a/cscs-checks/tools/profiling_and_debugging/nvprof.py
+++ b/cscs-checks/tools/profiling_and_debugging/nvprof.py
@@ -36,7 +36,7 @@ def __init__(self):
         # the programming environment should be adapted / fixed
         if self.current_system.name == 'kesch':
             self.exclusive_access = True
-            self.modules = ['craype-accel-nvidia35']
+            self.modules = ['cudatoolkit/8.0.61']
             self.build_system.ldflags += ['-lcudart', '-lm']
         else:
             self.modules = ['craype-accel-nvidia60']