diff --git a/runtest/tempest.sls b/runtest/tempest.sls
index 4b6d24a..a2d54e4 100644
--- a/runtest/tempest.sls
+++ b/runtest/tempest.sls
@@ -57,6 +57,13 @@
     - pillar: {{ pillar }}
     - require:
       - tempest_config_file
+    {# Sometimes this task hangs infinitely when using salt 2017.7.0 #}
+    {%- if salt['grains.get']('saltversion') >= '2017.7.0' %}
+    - retry:
+        attempts: 3
+        until: True
+        interval: 10
+    {%- endif %}
 
 {%- endif %}