diff --git a/cscs-checks/tools/profiling_and_debugging/notool.py b/cscs-checks/tools/profiling_and_debugging/notool.py
index 5083dfcb6f..316b03c8a8 100644
--- a/cscs-checks/tools/profiling_and_debugging/notool.py
+++ b/cscs-checks/tools/profiling_and_debugging/notool.py
@@ -9,37 +9,35 @@
 class JacobiNoToolHybrid(rfm.RegressionTest):
     def __init__(self, lang):
         super().__init__()
-
         self.name = 'jacobi_%s' % lang.replace('+', 'p')
         self.descr = '%s check' % lang
         self.language = lang
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc']
-
         self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
                                     'PrgEnv-intel', 'PrgEnv-pgi']
-
         self.prgenv_flags = {
-            'PrgEnv-cray': '-O2 -g -homp',
-            'PrgEnv-gnu': '-O2 -g -fopenmp',
-            'PrgEnv-intel': '-O2 -g -qopenmp',
-            'PrgEnv-pgi': '-O2 -g -mp'
+            'PrgEnv-cray': ['-O2', '-g', '-homp'],
+            'PrgEnv-gnu': ['-O2', '-g', '-fopenmp'],
+            'PrgEnv-intel': ['-O2', '-g', '-qopenmp'],
+            'PrgEnv-pgi': ['-O2', '-g', '-mp']
         }
-
         self.sourcesdir = os.path.join('src', lang)
         self.executable = './jacobi'
+        self.build_system = 'Make'
+        # NOTE: Restrict concurrency to allow creation of Fortran modules
+        if lang == 'F90':
+            self.build_system.max_concurrency = 1
 
         self.num_tasks = 3
         self.num_tasks_per_node = 3
         self.num_cpus_per_task = 4
         self.num_iterations = 200
-
         self.variables = {
             'OMP_NUM_THREADS': str(self.num_cpus_per_task),
             'ITERATIONS': str(self.num_iterations),
             'OMP_PROC_BIND': 'true',
             'CRAYPE_LINK_TYPE': 'dynamic'
         }
-
         self.openmp_versions = ScopedDict({
             'daint:PrgEnv-cray': {'version': 201307},
             'daint:PrgEnv-gnu': {'version': 201307},
@@ -61,37 +59,32 @@ def __init__(self, lang):
             'elapsed_time': sn.extractsingle(r'Elapsed Time\s*:\s+(\S+)',
                                              self.stdout, 1, float)
         }
-
         self.reference_prgenv = {
             'PrgEnv-gnu': (0.90, -0.6, None),
             'PrgEnv-cray': (0.90, -0.6, None),
             'PrgEnv-intel': (0.90, -0.6, None),
             'PrgEnv-pgi': (18.0, -0.6, None),
         }
-
         self.reference = {
             '*': {
                 'elapsed_time': (0, None, None)
             }
         }
-        self.maintainers = ['VH', 'JG']
-        self.tags = {'production'}
-
         self.post_run = ['module list -t']
 
-    def compile(self):
-        prgenv_flags = self.prgenv_flags[self.current_environ.name]
-        self.current_environ.cflags = prgenv_flags
-        self.current_environ.cxxflags = prgenv_flags
-        self.current_environ.fflags = prgenv_flags
-        self.current_environ.ldflags = '-lm '
-        super().compile()
+        self.maintainers = ['VH', 'JG']
+        self.tags = {'production'}
 
     def setup(self, partition, environ, **job_opts):
         super().setup(partition, environ, **job_opts)
+        environ_name = self.current_environ.name
+        prgenv_flags = self.prgenv_flags[environ_name]
+        self.build_system.cflags = prgenv_flags
+        self.build_system.cxxflags = prgenv_flags
+        self.build_system.fflags = prgenv_flags
+        self.build_system.ldflags = ['-lm']
         found_version = sn.extractsingle(
             r'OpenMP-\s*(\d+)', self.stdout, 1, int)
-        environ_name = self.current_environ.name
         ompversion_key = '%s:%s:%s:version' % (
             self.current_system.name, environ_name, self.language)
         self.sanity_patterns = sn.all([