diff --git a/elasticsearch/map.jinja b/elasticsearch/map.jinja
index 09d76d5..6bfb50d 100644
--- a/elasticsearch/map.jinja
+++ b/elasticsearch/map.jinja
@@ -45,7 +45,7 @@
     'default': {
         'service_failed_warning_threshold_percent': 0.3,
         'service_failed_critical_threshold_percent': 0.6,
-        'service_disk_space_watermark_minor_threshold_percent': 0.6,
-        'service_disk_space_watermark_major_threshold_percent': 0.75,
+        'service_disk_space_watermark_minor_threshold_percent': 0.8,
+        'service_disk_space_watermark_major_threshold_percent': 0.85,
     },
 }, grain='os_family', merge=salt['pillar.get']('elasticsearch:monitoring')) %}
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 9761585..0ab7d81 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -39,7 +39,7 @@
     log_info "Setting up Python virtualenv"
     virtualenv $VENV_DIR
     source ${VENV_DIR}/bin/activate
-    python -m pip install salt${PIP_SALT_VERSION}
+    python -m pip install salt${PIP_SALT_VERSION} 'msgpack<1'
 }
 
 setup_mock_bin() {