12 files changed, 27 insertions, 0 deletions
diff --git a/tests-clar/refs/branches/create.c b/tests-clar/refs/branches/create.c
index 9026b0de1..5ecb42848 100644
--- a/tests-clar/refs/branches/create.c
+++ b/tests-clar/refs/branches/create.c
@@ -16,9 +16,13 @@ void test_refs_branches_create__initialize(void)
 void test_refs_branches_create__cleanup(void)
 {
 	git_reference_free(branch);
+	branch = NULL;
 
 	git_object_free(target);
+	target = NULL;
+
 	git_repository_free(repo);
+	repo = NULL;
 
 	cl_fixture_cleanup("testrepo.git");
 }
diff --git a/tests-clar/refs/branches/delete.c b/tests-clar/refs/branches/delete.c
index da7db13fc..75271a21c 100644
--- a/tests-clar/refs/branches/delete.c
+++ b/tests-clar/refs/branches/delete.c
@@ -20,7 +20,10 @@ void test_refs_branches_delete__initialize(void)
 void test_refs_branches_delete__cleanup(void)
 {
 	git_reference_free(fake_remote);
+	fake_remote = NULL;
+
 	git_repository_free(repo);
+	repo = NULL;
 
 	cl_fixture_cleanup("testrepo.git");
 }
diff --git a/tests-clar/refs/branches/foreach.c b/tests-clar/refs/branches/foreach.c
index 92d5b1f65..dfa04395b 100644
--- a/tests-clar/refs/branches/foreach.c
+++ b/tests-clar/refs/branches/foreach.c
@@ -18,7 +18,10 @@ void test_refs_branches_foreach__initialize(void)
 void test_refs_branches_foreach__cleanup(void)
 {
 	git_reference_free(fake_remote);
+	fake_remote = NULL;
+
 	git_repository_free(repo);
+	repo = NULL;
 
 	cl_fixture_cleanup("testrepo.git");
 }
diff --git a/tests-clar/refs/branches/ishead.c b/tests-clar/refs/branches/ishead.c
index 52a0a1941..2ab488f22 100644
--- a/tests-clar/refs/branches/ishead.c
+++ b/tests-clar/refs/branches/ishead.c
@@ -13,7 +13,10 @@ void test_refs_branches_ishead__initialize(void)
 void test_refs_branches_ishead__cleanup(void)
 {
 	git_reference_free(branch);
+	branch = NULL;
+
 	git_repository_free(repo);
+	repo = NULL;
 }
 
 void test_refs_branches_ishead__can_tell_if_a_branch_is_pointed_at_by_HEAD(void)
diff --git a/tests-clar/refs/branches/lookup.c b/tests-clar/refs/branches/lookup.c
index 2aabf9889..d07ed0ed8 100644
--- a/tests-clar/refs/branches/lookup.c
+++ b/tests-clar/refs/branches/lookup.c
@@ -14,8 +14,10 @@ void test_refs_branches_lookup__initialize(void)
 void test_refs_branches_lookup__cleanup(void)
 {
 	git_reference_free(branch);
+	branch = NULL;
 
 	git_repository_free(repo);
+	repo = NULL;
 }
 
 void test_refs_branches_lookup__can_retrieve_a_local_branch(void)
diff --git a/tests-clar/refs/branches/move.c b/tests-clar/refs/branches/move.c
index 042469016..4bf1d69d0 100644
--- a/tests-clar/refs/branches/move.c
+++ b/tests-clar/refs/branches/move.c
@@ -15,6 +15,8 @@ void test_refs_branches_move__initialize(void)
 void test_refs_branches_move__cleanup(void)
 {
 	git_reference_free(ref);
+	ref = NULL;
+
 	cl_git_sandbox_cleanup();
 }
 
diff --git a/tests-clar/refs/branches/tracking.c b/tests-clar/refs/branches/tracking.c
index 9cf435e88..9378ecad5 100644
--- a/tests-clar/refs/branches/tracking.c
+++ b/tests-clar/refs/branches/tracking.c
@@ -14,8 +14,10 @@ void test_refs_branches_tracking__initialize(void)
 void test_refs_branches_tracking__cleanup(void)
 {
 	git_reference_free(branch);
+	branch = NULL;
 
 	git_repository_free(repo);
+	repo = NULL;
 }
 
 void test_refs_branches_tracking__can_retrieve_the_remote_tracking_reference_of_a_local_branch(void)
diff --git a/tests-clar/refs/foreachglob.c b/tests-clar/refs/foreachglob.c
index 121342933..8ecce9cfe 100644
--- a/tests-clar/refs/foreachglob.c
+++ b/tests-clar/refs/foreachglob.c
@@ -18,7 +18,10 @@ void test_refs_foreachglob__initialize(void)
 void test_refs_foreachglob__cleanup(void)
 {
 	git_reference_free(fake_remote);
+	fake_remote = NULL;
+
 	git_repository_free(repo);
+	repo = NULL;
 
 	cl_fixture_cleanup("testrepo.git");
 }
diff --git a/tests-clar/refs/peel.c b/tests-clar/refs/peel.c
index 35a290b2e..6fa6009d5 100644
--- a/tests-clar/refs/peel.c
+++ b/tests-clar/refs/peel.c
@@ -10,6 +10,7 @@ void test_refs_peel__initialize(void)
 void test_refs_peel__cleanup(void)
 {
 	git_repository_free(g_repo);
+	g_repo = NULL;
 }
 
 static void assert_peel(
diff --git a/tests-clar/refs/read.c b/tests-clar/refs/read.c
index c2647e2db..b867c9722 100644
--- a/tests-clar/refs/read.c
+++ b/tests-clar/refs/read.c
@@ -22,6 +22,7 @@ void test_refs_read__initialize(void)
 void test_refs_read__cleanup(void)
 {
 	git_repository_free(g_repo);
+	g_repo = NULL;
 }
 
 void test_refs_read__loose_tag(void)
diff --git a/tests-clar/refs/reflog/drop.c b/tests-clar/refs/reflog/drop.c
index 512e8ba02..d805d1ee0 100644
--- a/tests-clar/refs/reflog/drop.c
+++ b/tests-clar/refs/reflog/drop.c
@@ -22,6 +22,7 @@ void test_refs_reflog_drop__initialize(void)
 void test_refs_reflog_drop__cleanup(void)
 {
 	git_reflog_free(g_reflog);
+	g_reflog = NULL;
 
 	cl_git_sandbox_cleanup();
 }
diff --git a/tests-clar/refs/unicode.c b/tests-clar/refs/unicode.c
index 889c85666..fbe95b19f 100644
--- a/tests-clar/refs/unicode.c
+++ b/tests-clar/refs/unicode.c
@@ -12,6 +12,8 @@ void test_refs_unicode__initialize(void)
 void test_refs_unicode__cleanup(void)
 {
 	git_repository_free(repo);
+	repo = NULL;
+
 	cl_fixture_cleanup("testrepo.git");
 }