diff --git a/tests-clar/clone/empty.c b/tests-clar/clone/empty.c
index 0f0edcb8d..8f2e6ff12 100644
--- a/tests-clar/clone/empty.c
+++ b/tests-clar/clone/empty.c
@@ -6,6 +6,7 @@
 static git_clone_options g_options;
 static git_remote *g_origin;
 static git_repository *g_repo;
+static git_repository *g_repo_cloned;
 
 void test_clone_empty__initialize(void)
 {
@@ -29,6 +30,9 @@ void test_clone_empty__cleanup(void)
 static void cleanup_repository(void *path)
 {
 	cl_fixture_cleanup((const char *)path);
+
+	git_repository_free(g_repo_cloned);
+	g_repo_cloned = NULL;
 }
 
 void test_clone_empty__can_clone_an_empty_local_repo_barely(void)
@@ -40,7 +44,7 @@ void test_clone_empty__can_clone_an_empty_local_repo_barely(void)
 	cl_git_pass(git_remote_new(&g_origin, NULL, "origin", "./empty_bare.git", GIT_REMOTE_DEFAULT_FETCH));
 
 	g_options.bare = true;
-	cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options));
+	cl_git_pass(git_clone(&g_repo_cloned, g_origin, "./empty", &g_options));
 }
 
 void test_clone_empty__can_clone_an_empty_local_repo(void)
@@ -51,7 +55,7 @@ void test_clone_empty__can_clone_an_empty_local_repo(void)
 	g_origin = NULL;
 	cl_git_pass(git_remote_new(&g_origin, NULL, "origin", "./empty_bare.git", GIT_REMOTE_DEFAULT_FETCH));
 
-	cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options));
+	cl_git_pass(git_clone(&g_repo_cloned, g_origin, "./empty", &g_options));
 }
 
 void test_clone_empty__can_clone_an_empty_standard_repo(void)
@@ -66,5 +70,5 @@ void test_clone_empty__can_clone_an_empty_standard_repo(void)
 
 	cl_set_cleanup(&cleanup_repository, "./empty");
 
-	cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options));
+	cl_git_pass(git_clone(&g_repo_cloned, g_origin, "./empty", &g_options));
 }
diff --git a/tests-clar/diff/index.c b/tests-clar/diff/index.c
index 41941ee28..e1c617dae 100644
--- a/tests-clar/diff/index.c
+++ b/tests-clar/diff/index.c
@@ -146,18 +146,22 @@ void test_diff_index__checks_options_version(void)
 	const char *a_commit = "26a125ee1bf";
 	git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit);
 	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
-	git_diff_list *diff;
+	git_diff_list *diff = NULL;
 	const git_error *err;
 
 	opts.version = 0;
 	cl_git_fail(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts));
 	err = giterr_last();
 	cl_assert_equal_i(GITERR_INVALID, err->klass);
+	cl_assert_equal_p(diff, NULL);
 
 	giterr_clear();
 	opts.version = 1024;
 	cl_git_fail(git_diff_tree_to_index(&diff, g_repo, a, NULL, &opts));
 	err = giterr_last();
 	cl_assert_equal_i(GITERR_INVALID, err->klass);
+	cl_assert_equal_p(diff, NULL);
+
+	git_tree_free(a);
 }
 
diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c
index 4324cb79b..651cbefec 100644
--- a/tests-clar/network/remotes.c
+++ b/tests-clar/network/remotes.c
@@ -172,6 +172,7 @@ void test_network_remotes__missing_refspecs(void)
 	git_config *cfg;
 
 	git_remote_free(_remote);
+	_remote = NULL;
 
 	cl_git_pass(git_repository_config(&cfg, _repo));
 	cl_git_pass(git_config_set_string(cfg, "remote.specless.url", "http://example.com"));
@@ -200,11 +201,17 @@ void test_network_remotes__list(void)
 
 void test_network_remotes__loading_a_missing_remote_returns_ENOTFOUND(void)
 {
+	git_remote_free(_remote);
+	_remote = NULL;
+
 	cl_assert_equal_i(GIT_ENOTFOUND, git_remote_load(&_remote, _repo, "just-left-few-minutes-ago"));
 }
 
 void test_network_remotes__loading_with_an_invalid_name_returns_EINVALIDSPEC(void)
 {
+	git_remote_free(_remote);
+	_remote = NULL;
+
 	cl_assert_equal_i(GIT_EINVALIDSPEC, git_remote_load(&_remote, _repo, "Inv@{id"));
 }
 
@@ -220,8 +227,12 @@ void test_network_remotes__loading_with_an_invalid_name_returns_EINVALIDSPEC(voi
 void test_network_remotes__add(void)
 {
 	git_remote_free(_remote);
+	_remote = NULL;
+
 	cl_git_pass(git_remote_add(&_remote, _repo, "addtest", "http://github.com/libgit2/libgit2"));
+
 	git_remote_free(_remote);
+	_remote = NULL;
 
 	cl_git_pass(git_remote_load(&_remote, _repo, "addtest"));
 	_refspec = git_remote_fetchspec(_remote);
@@ -252,28 +263,32 @@ void test_network_remotes__cannot_save_a_nameless_remote(void)
 
 void test_network_remotes__cannot_add_a_remote_with_an_invalid_name(void)
 {
-	git_remote *remote;
+	git_remote *remote = NULL;
 
 	cl_assert_equal_i(
 		GIT_EINVALIDSPEC,
 		git_remote_add(&remote, _repo, "Inv@{id", "git://github.com/libgit2/libgit2"));
+	cl_assert_equal_p(remote, NULL);
 
 	cl_assert_equal_i(
 		GIT_EINVALIDSPEC,
 		git_remote_add(&remote, _repo, "", "git://github.com/libgit2/libgit2"));
+	cl_assert_equal_p(remote, NULL);
 }
 
 void test_network_remotes__cannot_initialize_a_remote_with_an_invalid_name(void)
 {
-	git_remote *remote;
+	git_remote *remote = NULL;
 
 	cl_assert_equal_i(
 		GIT_EINVALIDSPEC,
 		git_remote_new(&remote, _repo, "Inv@{id", "git://github.com/libgit2/libgit2", NULL));
+	cl_assert_equal_p(remote, NULL);
 
 	cl_assert_equal_i(
 		GIT_EINVALIDSPEC,
 		git_remote_new(&remote, _repo, "", "git://github.com/libgit2/libgit2", NULL));
+	cl_assert_equal_p(remote, NULL);
 }
 
 void test_network_remotes__tagopt(void)
@@ -302,10 +317,11 @@ void test_network_remotes__tagopt(void)
 
 void test_network_remotes__cannot_load_with_an_empty_url(void)
 {
-	git_remote *remote;
+	git_remote *remote = NULL;
 
 	cl_git_fail(git_remote_load(&remote, _repo, "empty-remote-url"));
 	cl_assert(giterr_last()->klass == GITERR_INVALID);
+	cl_assert_equal_p(remote, NULL);
 }
 
 void test_network_remotes__check_structure_version(void)
@@ -314,6 +330,7 @@ void test_network_remotes__check_structure_version(void)
 	const git_error *err;
 
 	git_remote_free(_remote);
+	_remote = NULL;
 	cl_git_pass(git_remote_new(&_remote, _repo, NULL, "test-protocol://localhost", NULL));
 
 	transport.version = 0;
@@ -330,6 +347,9 @@ void test_network_remotes__check_structure_version(void)
 
 void test_network_remotes__dangling(void)
 {
+	git_remote_free(_remote);
+	_remote = NULL;
+
 	cl_git_pass(git_remote_new(&_remote, NULL, "upstream", "git://github.com/libgit2/libgit2", NULL));
 
 	cl_git_pass(git_remote_rename(_remote, "newname", NULL, NULL));
diff --git a/tests-clar/revwalk/mergebase.c b/tests-clar/revwalk/mergebase.c
index 9707d42ca..4faf6156f 100644
--- a/tests-clar/revwalk/mergebase.c
+++ b/tests-clar/revwalk/mergebase.c
@@ -15,6 +15,9 @@ void test_revwalk_mergebase__cleanup(void)
 {
 	git_repository_free(_repo);
 	_repo = NULL;
+
+	git_repository_free(_repo2);
+	_repo2 = NULL;
 }
 
 void test_revwalk_mergebase__single1(void)