diff --git a/cscs-checks/tools/profiling_and_debugging/notool.py b/cscs-checks/tools/profiling_and_debugging/notool.py
index e4ac6e2bcb..94c91527f4 100644
--- a/cscs-checks/tools/profiling_and_debugging/notool.py
+++ b/cscs-checks/tools/profiling_and_debugging/notool.py
@@ -12,10 +12,12 @@ def __init__(self, lang):
         self.descr = 'Jacobi (without tool) %s check' % lang
         self.name = '%s_%s' % (type(self).__name__, lang.replace('+', 'p'))
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
-        self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
-                                    'PrgEnv-intel', 'PrgEnv-pgi']
+        self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-cray_classic',
+                                    'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi']
         self.prgenv_flags = {
-            'PrgEnv-cray': ['-O2', '-g', '-homp'],
+            'PrgEnv-cray': ['-O2', '-g',
+                            '-homp' if lang == 'F90' else '-fopenmp'],
+            'PrgEnv-cray_classic': ['-O2', '-g', '-homp'],
             'PrgEnv-gnu': ['-O2', '-g', '-fopenmp'],
             'PrgEnv-intel': ['-O2', '-g', '-qopenmp'],
             'PrgEnv-pgi': ['-O2', '-g', '-mp']
@@ -42,6 +44,7 @@ def __init__(self, lang):
         # OpenMP support varies between compilers:
         self.openmp_versions = ScopedDict({
             'PrgEnv-cray': {'version': 201511},
+            'PrgEnv-cray_classic': {'version': 201511},
             'PrgEnv-gnu': {'version': 201511},
             'PrgEnv-intel': {'version': 201611},
             'PrgEnv-pgi': {'version': 201307},
@@ -68,6 +71,7 @@ def __init__(self, lang):
         if lang == 'C++':
             self.reference_prgenv = {
                 'PrgEnv-cray': (0.38, -0.6, None, 's'),
+                'PrgEnv-cray_classic': (0.38, -0.6, None, 's'),
                 'PrgEnv-gnu': (0.38, -0.6, None, 's'),
                 'PrgEnv-intel': (0.38, -0.6, None, 's'),
                 'PrgEnv-pgi': (18.0, -0.6, None, 's'),
@@ -75,6 +79,7 @@ def __init__(self, lang):
         elif lang == 'F90':
             self.reference_prgenv = {
                 'PrgEnv-cray': (0.17, -0.6, None, 's'),
+                'PrgEnv-cray_classic': (0.17, -0.6, None, 's'),
                 'PrgEnv-gnu': (0.17, -0.6, None, 's'),
                 'PrgEnv-intel': (0.17, -0.6, None, 's'),
                 'PrgEnv-pgi': (18.0, -0.6, None, 's'),
diff --git a/cscs-checks/tools/profiling_and_debugging/perftools.py b/cscs-checks/tools/profiling_and_debugging/perftools.py
index 472545474a..91115e28c9 100644
--- a/cscs-checks/tools/profiling_and_debugging/perftools.py
+++ b/cscs-checks/tools/profiling_and_debugging/perftools.py
@@ -17,8 +17,8 @@ def __init__(self, lang):
         else:
             self.valid_systems = ['daint:gpu', 'dom:gpu']
 
-        self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
-                                    'PrgEnv-intel', 'PrgEnv-pgi']
+        self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-cray_classic',
+                                    'PrgEnv-gnu', 'PrgEnv-intel', 'PrgEnv-pgi']
         if lang == 'Cpp':
             self.sourcesdir = os.path.join('src', 'C++')
         else:
@@ -31,7 +31,10 @@ def __init__(self, lang):
             self.build_system.max_concurrency = 1
 
         self.prgenv_flags = {
-            'PrgEnv-cray': ['-O2', '-g', '-h nomessage=3140', '-homp'],
+            'PrgEnv-cray': ['-O2', '-g', '-h nomessage=3140',
+                            '-homp' if lang == 'F90' else '-fopenmp'],
+            'PrgEnv-cray_classic': ['-O2', '-g', '-h nomessage=3140',
+                                    '-homp'],
             'PrgEnv-gnu': ['-O2', '-g', '-fopenmp'],
             'PrgEnv-intel': ['-O2', '-g', '-qopenmp'],
             'PrgEnv-pgi': ['-O2', '-g', '-mp']
@@ -79,4 +82,3 @@ def setup(self, environ, partition, **job_opts):
         self.build_system.cflags = flags
         self.build_system.cxxflags = flags
         self.build_system.fflags = flags
-        self.build_system.ldflags = flags