diff --git a/heat/server.sls b/heat/server.sls
index bee5b3c..5404fef 100644
--- a/heat/server.sls
+++ b/heat/server.sls
@@ -134,23 +134,6 @@
 {%- endif %}
 
 {%- if not grains.get('virtual_subtype', None) == "Docker" %}
-
-{%- if not salt['pillar.get']('linux:system:repo:mirantis_openstack', False) %}
-
-heat_client_roles:
-  keystone.role_present:
-  - names:
-    - heat_stack_owner
-    - heat_stack_user
-  - connection_user: {{ server.identity.user }}
-  - connection_password: {{ server.identity.password }}
-  - connection_tenant: {{ server.identity.tenant }}
-  - connection_auth_url: 'http://{{ server.identity.host }}:{{ server.identity.port }}/v2.0/'
-  - require:
-    - pkg: heat_server_packages
-
-{%- endif %}
-
 {%- if server.version != 'juno' %}
 
 heat_keystone_setup:
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index ea1a363..7da2a75 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -37,7 +37,7 @@
     log_info "Setting up Python virtualenv"
     virtualenv $VENV_DIR
     source ${VENV_DIR}/bin/activate
-    pip install salt${PIP_SALT_VERSION}
+    python -m pip install salt${PIP_SALT_VERSION}
 }
 
 setup_pillar() {
@@ -112,7 +112,7 @@
 
 salt_run() {
     [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
-    salt-call ${SALT_OPTS} $*
+    python $(which salt-call) ${SALT_OPTS} $*
 }
 
 prepare() {