diff --git a/test/integration/targets/git/handlers/main.yml b/test/integration/targets/git/handlers/main.yml
new file mode 100644
index 00000000000..a96627adc98
--- /dev/null
+++ b/test/integration/targets/git/handlers/main.yml
@@ -0,0 +1,11 @@
+- name: remove git
+  package:
+    name: git
+    state: absent
+
+- name: remove git from FreeBSD
+  pkgng:
+    name: git
+    state: absent
+    autoremove: yes
+  when: ansible_distribution == "FreeBSD"
diff --git a/test/integration/targets/git/tasks/setup.yml b/test/integration/targets/git/tasks/setup.yml
index 8fdb2a401c7..f5f416b4d8e 100644
--- a/test/integration/targets/git/tasks/setup.yml
+++ b/test/integration/targets/git/tasks/setup.yml
@@ -12,6 +12,9 @@
   package:
     name: git
   when: ansible_distribution != "MacOSX"
+  notify:
+    - remove git
+    - remove git from FreeBSD
 
 - name: SETUP | verify that git is installed so this test can continue
   shell: which git