diff --git a/ci/scripts/acceptance-tests b/ci/scripts/acceptance-tests
index 01b645c8..fb71db86 100755
--- a/ci/scripts/acceptance-tests
+++ b/ci/scripts/acceptance-tests
@@ -14,12 +14,7 @@ if [ -n "$FOCUS" ]; then
   ADDITIONAL_ARGS=("--focus" "$FOCUS")
 fi
 
-cd ${REPO_ROOT:?required}
-
-# TODO TEMPORARY: REMOVE BEFORE MERGE
-git config --global --add safe.directory /repo
-git config --global --add safe.directory /repo/src/ttar
-
+cd "${REPO_ROOT:?required}"
 echo "----- Pulling in any git submodules..."
 git submodule update --init --recursive --force
 
diff --git a/spec/haproxy/templates/haproxy_config/healthcheck_listener_spec.rb b/spec/haproxy/templates/haproxy_config/healthcheck_listener_spec.rb
index d3214d3d..f85ac41f 100644
--- a/spec/haproxy/templates/haproxy_config/healthcheck_listener_spec.rb
+++ b/spec/haproxy/templates/haproxy_config/healthcheck_listener_spec.rb
@@ -76,7 +76,7 @@
           {
             'enable_health_check_http' => true,
             'accept_proxy' => true,
-            'disable_health_check_proxy' => true,
+            'disable_health_check_proxy' => true
           }
         end
 
@@ -84,7 +84,6 @@
           expect(healthcheck_listener).not_to include('tcp-request connection expect-proxy layer4 unless LOCALHOST')
         end
       end
-
     end
   end
 end