diff --git a/tests/network/remote/remotes.c b/tests/network/remote/remotes.c
index 1d5d318c5..45f2a795f 100644
--- a/tests/network/remote/remotes.c
+++ b/tests/network/remote/remotes.c
@@ -91,31 +91,24 @@ void test_network_remote_remotes__error_when_no_push_available(void)
 	git_remote_free(r);
 }
 
-void test_network_remote_remotes__supported_transport_methods_are_supported(void)
+void test_network_remote_remotes__supported_urls(void)
 {
-	cl_assert(git_remote_supported_url("git://github.com/libgit2/libgit2"));
-	cl_assert(git_remote_supported_url("http://github.com/libgit2/libgit2"));
+	int ssh_supported = 0, https_supported = 0;
 
 #ifdef GIT_SSH
-	cl_assert(git_remote_supported_url("git@github.com:libgit2/libgit2.git"));
-	cl_assert(git_remote_supported_url("ssh://git@github.com/libgit2/libgit2.git"));
+	ssh_supported = 1;
 #endif
 
 #if defined(GIT_SSL) || defined(GIT_WINHTTP)
-	cl_assert(git_remote_supported_url("https://git@github.com/libgit2/libgit2.git"));
-#endif
-}
-
-void test_network_remote_remotes__unsupported_transport_methods_are_unsupported(void)
-{
-#ifndef GIT_SSH
-	cl_assert(!git_remote_supported_url("git@github.com:libgit2/libgit2.git"));
-	cl_assert(!git_remote_supported_url("ssh://git@github.com/libgit2/libgit2.git"));
+	https_supported = 1;
 #endif
 
-#if !defined(GIT_SSL) && !defined(GIT_WINHTTP)
-	cl_assert(!git_remote_supported_url("https://git@github.com/libgit2/libgit2.git"));
-#endif
+	cl_assert(git_remote_supported_url("git://github.com/libgit2/libgit2"));
+	cl_assert(git_remote_supported_url("http://github.com/libgit2/libgit2"));
+
+	cl_assert_equal_i(ssh_supported, git_remote_supported_url("git@github.com:libgit2/libgit2.git"));
+	cl_assert_equal_i(ssh_supported, git_remote_supported_url("ssh://git@github.com/libgit2/libgit2.git"));
+	cl_assert_equal_i(https_supported, git_remote_supported_url("https://github.com/libgit2/libgit2.git"));
 }
 
 void test_network_remote_remotes__refspec_parsing(void)