diff --git a/cscs-checks/prgenv/environ_check.py b/cscs-checks/prgenv/environ_check.py
index 0fec0cb03b..8953f45b1e 100644
--- a/cscs-checks/prgenv/environ_check.py
+++ b/cscs-checks/prgenv/environ_check.py
@@ -62,12 +62,15 @@ def __init__(self, module_name):
             sn.assert_found(f'{envvar_prefix}_VERSION', self.stderr)
         ])
 
-        # These modules should be fixed in later releases
+        # FIXME: These modules should be fixed in later releases,
+        # while gcc was fixed in 20.11
+
         cdt = osext.cray_cdt_version()
-        if (cdt and cdt <= '20.10' and
-            module_name in ['cray-petsc-complex',
-                            'cray-petsc-complex-64',
-                            'cudatoolkit', 'gcc']):
+        if ((cdt and cdt <= '20.11' and
+             module_name in ['cray-petsc-complex',
+                             'cray-petsc-complex-64',
+                             'cudatoolkit']) or
+            (cdt and cdt < 20.11 and module_name == 'gcc')):
             self.valid_systems = []
 
         self.maintainers = ['EK', 'VH']