diff --git a/etc-git/.kitchen.yml b/etc-git/.kitchen.yml
new file mode 100644
index 00000000..3ec7058a
--- /dev/null
+++ b/etc-git/.kitchen.yml
@@ -0,0 +1,35 @@
+---
+driver:
+  name: docker
+  privileged: true
+  use_sudo: false
+
+provisioner:
+  name: ansible_playbook
+  hosts: test-kitchen
+  roles_path: ../
+  ansible_verbose: true
+  require_ansible_source: true
+  install_source_rev: "stable-2.2.1.0"
+  require_chef_for_busser: false
+  idempotency_test: true
+
+platforms:
+  - name: debian-8
+
+verifier:
+  name: serverspec
+
+suites:
+  - name: default
+    provisioner:
+      name: ansible_playbook
+      playbook: ./tests/test.yml
+    verifier:
+      patterns:
+      - etc-git/tests/spec/etc-git_spec.rb
+      bundler_path: '/usr/local/bin'
+      rspec_path: '/usr/local/bin'
+
+transport:
+  max_ssh_sessions: 6
diff --git a/etc-git/tests/spec/etc-git_spec.rb b/etc-git/tests/spec/etc-git_spec.rb
new file mode 100644
index 00000000..9c95ad01
--- /dev/null
+++ b/etc-git/tests/spec/etc-git_spec.rb
@@ -0,0 +1,13 @@
+require 'net/http'
+require 'uri'
+
+require 'serverspec'
+set :backend, :exec
+
+describe file('/etc/.git/config') do
+  it { should be_file   }
+end
+
+describe command("cd /git && git status --porcelain") do
+  its(:stdout) { should be_empty }
+end
diff --git a/etc-git/tests/test.yml b/etc-git/tests/test.yml
new file mode 100644
index 00000000..3a9ca9fa
--- /dev/null
+++ b/etc-git/tests/test.yml
@@ -0,0 +1,4 @@
+---
+- hosts: test-kitchen
+  roles:
+    - role: etc-git