diff --git a/heat/meta/salt.yml b/heat/meta/salt.yml
new file mode 100644
index 0000000..eff9d22
--- /dev/null
+++ b/heat/meta/salt.yml
@@ -0,0 +1,14 @@
+orchestrate:
+  server:
+    priority: 700
+    batch: 1
+    require:
+    - salt: keystone.server
+  control:
+    priority: 710
+    batch: 1
+    require:
+    - salt: heat.server
+  client:
+    priority: 720
+
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 6710a50..8c07e58 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -18,7 +18,7 @@
 SALT_CONFIG_DIR=${SALT_CONFIG_DIR:-${BUILDDIR}/salt}
 SALT_CACHE_DIR=${SALT_CACHE_DIR:-${SALT_CONFIG_DIR}/cache}
 
-SALT_OPTS="${SALT_OPTS} --retcode-passthrough --local -c ${SALT_CONFIG_DIR}"
+SALT_OPTS="${SALT_OPTS} --retcode-passthrough --local -c ${SALT_CONFIG_DIR} --log-file=/dev/null"
 
 if [ "x${SALT_VERSION}" != "x" ]; then
     PIP_SALT_VERSION="==${SALT_VERSION}"