diff --git a/core/null.c b/core/null.c
index 470f3a3..7c3baf8 100644
--- a/core/null.c
+++ b/core/null.c
@@ -200,10 +200,10 @@ void *ipfs_null_listen (void *ptr)
     	}
     }
 
-    close(socketfd);
-
     thpool_destroy(thpool);
 
+    close(socketfd);
+
     return (void*) 2;
 }
 
diff --git a/test/test_helper.c b/test/test_helper.c
index 203ac88..64e3d4c 100644
--- a/test/test_helper.c
+++ b/test/test_helper.c
@@ -146,7 +146,7 @@ int drop_and_build_repository(const char* path, int swarm_port, struct Libp2pVec
 	}
 	mkdir(path, S_IRWXU);
 
-	return make_ipfs_repository(path, swarm_port, bootstrap_peers, peer_id);
+	return -make_ipfs_repository(path, swarm_port, bootstrap_peers, peer_id);
 }
 
 
diff --git a/test/testit.c b/test/testit.c
index 734ff2a..999f933 100644
--- a/test/testit.c
+++ b/test/testit.c
@@ -203,5 +203,8 @@ int main(int argc, char** argv) {
 		}
 	}
 	libp2p_logger_free();
+	fclose(stdin);
+	fclose(stdout);
+	fclose(stderr);
 	return 1;
 }