diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 9b80a57..2955a3a 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -18,6 +18,7 @@ provisioner:
   config_options:
     defaults:
       remote_tmp: /tmp
+      stdout_callback: yaml
   playbooks:
     converge: playbook.yml
   lint:
diff --git a/molecule/default/tests/test_git.yml b/molecule/default/tests/test_git.yml
deleted file mode 100644
index f413cf0..0000000
--- a/molecule/default/tests/test_git.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Molecule managed
-
----
-command:
-  git:
-    exit-status: 1
-    stderr: []
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index d2289b8..c9e1545 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -7,13 +7,13 @@
   hosts: all
   become: true
   vars:
-    goss_version: v0.3.2
+    goss_version: v0.3.7
     goss_arch: amd64
     goss_dst: /usr/local/bin/goss
     goss_sha256sum: 357f5c7f2e7949b412bce44349cd32ab19eb3947255a8ac805f884cc2c326059
     goss_url: "https://github.com/aelsabbahy/goss/releases/download/{{ goss_version }}/goss-linux-{{ goss_arch }}"
     goss_test_directory: /tmp
-    goss_format: documentation
+    goss_format: tap
   tasks:
     - name: Download and install Goss
       get_url:
@@ -37,7 +37,7 @@
       register: test_files
 
     - name: Execute Goss tests
-      shell: "bash -login -c '{{ goss_dst }} -g {{ item }} validate --format {{ goss_format }}'"
+      command: "{{ goss_dst }} -g {{ item }} validate -f {{ goss_format }}"
       register: test_results
       with_items: "{{ test_files.stdout_lines }}"