diff --git a/cscs-checks/microbenchmarks/hpcg/hpcg_benchmark.py b/cscs-checks/microbenchmarks/hpcg/hpcg_benchmark.py
index 106d24c53f..20a4d8dcd8 100644
--- a/cscs-checks/microbenchmarks/hpcg/hpcg_benchmark.py
+++ b/cscs-checks/microbenchmarks/hpcg/hpcg_benchmark.py
@@ -12,7 +12,9 @@ def __init__(self):
         self.descr = 'HPCG reference benchmark'
         self.valid_systems = ['daint:mc', 'daint:gpu', 'dom:gpu', 'dom:mc']
         self.valid_prog_environs = ['PrgEnv-gnu']
-        self.modules = ['craype-hugepages8M']
+        if self.current_system.name in {'daint', 'dom'}:
+            self.modules = ['craype-hugepages8M']
+
         self.build_system = 'Make'
         self.build_system.options = ['arch=MPI_GCC_OMP']
         self.sourcesdir = 'https://github.com/hpcg-benchmark/hpcg.git'
@@ -44,6 +46,9 @@ def __init__(self):
             'dom:mc': {
                 'gflops': (13.4, -0.1, None, 'Gflop/s')
             },
+            '*': {
+                'gflops': (0, None, None, 'Gflop/s')
+            }
         }
 
         self.maintainers = ['SK']
@@ -55,8 +60,9 @@ def num_tasks_assigned(self):
         return self.job.num_tasks
 
     def setup(self, partition, environ, **job_opts):
-        self.num_tasks_per_node = self.system_num_tasks[partition.fullname]
-
+        self.num_tasks_per_node = self.system_num_tasks.get(
+            partition.fullname, 1
+        )
         num_nodes = self.num_tasks_assigned / self.num_tasks_per_node
         self.perf_patterns = {
             'gflops': sn.extractsingle(