diff --git a/ci-scripts/ci-runner.bash b/ci-scripts/ci-runner.bash
index 76cfc415b5..a10977653c 100644
--- a/ci-scripts/ci-runner.bash
+++ b/ci-scripts/ci-runner.bash
@@ -196,6 +196,10 @@ else
     # Find modified or added user checks
     userchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \
                    grep -e '^cscs-checks/.*\.py') )
+    if [[ $(hostname) =~ daint ]]; then
+        # FIXME: temporarily disable running modified checks on Daint
+        userchecks=()
+    fi
 
     if [ ${#userchecks[@]} -ne 0 ]; then
         userchecks_path=""
diff --git a/config/cscs.py b/config/cscs.py
index 842a44445d..6bf83d1b80 100644
--- a/config/cscs.py
+++ b/config/cscs.py
@@ -61,12 +61,13 @@ class ReframeSettings:
                 'modules_system': 'tmod',
                 'resourcesdir': '/apps/common/UES/reframe/resources',
                 'partitions': {
+                    # FIXME: temporarily disable PrgEnv-pgi on all partitions
                     'login': {
                         'scheduler': 'local',
                         'modules': [],
                         'access':  [],
                         'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
-                                     'PrgEnv-intel', 'PrgEnv-pgi'],
+                                     'PrgEnv-intel'],
                         'descr': 'Login nodes',
                         'max_jobs': 4
                     },
@@ -76,7 +77,7 @@ class ReframeSettings:
                         'modules': ['daint-gpu'],
                         'access':  ['--constraint=gpu'],
                         'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
-                                     'PrgEnv-intel', 'PrgEnv-pgi'],
+                                     'PrgEnv-intel'],
                         'descr': 'Hybrid nodes (Haswell/P100)',
                         'max_jobs': 100,
                         'resources': {
@@ -89,7 +90,7 @@ class ReframeSettings:
                         'modules': ['daint-mc'],
                         'access':  ['--constraint=mc'],
                         'environs': ['PrgEnv-cray', 'PrgEnv-gnu',
-                                     'PrgEnv-intel', 'PrgEnv-pgi'],
+                                     'PrgEnv-intel'],
                         'descr': 'Multicore nodes (Broadwell)',
                         'max_jobs': 100,
                         'resources': {