diff --git a/cscs-checks/compile/haswell_fma_check.py b/cscs-checks/compile/haswell_fma_check.py
index 76b94a487c..2efe9f34e5 100644
--- a/cscs-checks/compile/haswell_fma_check.py
+++ b/cscs-checks/compile/haswell_fma_check.py
@@ -10,11 +10,15 @@ def __init__(self):
         self.descr = 'check for avx2 instructions'
         self.valid_systems = ['dom:login', 'daint:login', 'kesch:login']
         if self.current_system.name == 'kesch':
-            self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
-                                        'PrgEnv-cray-nompi', 'PrgEnv-gnu-nompi']
+            self.valid_prog_environs = [
+                'PrgEnv-cray', 'PrgEnv-gnu', 'PrgEnv-cray-nompi',
+                'PrgEnv-gnu-nompi'
+            ]
         else:
-            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.modules = ['craype-haswell']
 
         self.sourcesdir = 'src/haswell_fma'
@@ -42,5 +46,9 @@ def setup(self, partition, environ, **job_opts):
                 self.build_system.cflags += ['-march=native']
                 self.build_system.cxxflags += ['-march=native']
                 self.build_system.fflags += ['-march=native']
+        else:
+            if environ.name == 'PrgEnv-cray':
+                self.build_system.cflags = ['-Ofast', '-S']
+                self.build_system.cxxflags = ['-Ofast', '-S']
 
         super().setup(partition, environ, **job_opts)