diff --git a/tasks/zun_post_install.yml b/tasks/zun_post_install.yml
index 8b7a70f..8fbed79 100644
--- a/tasks/zun_post_install.yml
+++ b/tasks/zun_post_install.yml
@@ -16,14 +16,17 @@
 - name: Define the docker api
   block:
     - name: Get docker api version
-      command: "docker version"
+      command: >-
+        {% raw %}
+        docker version -f "{{.Client.APIVersion }}"
+        {% endraw %}
       failed_when: false
       changed_when: false
       register: docker_version
 
     - name: Set docker api version fact
       set_fact:
-        zun_docker_api_version: "{{ (docker_version.stdout | from_yaml)['Client']['API version'] }}"
+        zun_docker_api_version: "{{ docker_version.stdout | trim }}"
   when:
     - zun_services['zun-compute']['group'] in group_names
 
diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml
index 0a2006e..5ea0555 100644
--- a/tests/group_vars/all_containers.yml
+++ b/tests/group_vars/all_containers.yml
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+tempest_network_ping_gateway: False
+
 container_networks:
   management_address:
     address: "{{ ansible_host }}"