diff --git a/test/35fa71a030ca.c b/test/35fa71a030ca.c
index f83cc9d7..9a6ddb68 100644
--- a/test/35fa71a030ca.c
+++ b/test/35fa71a030ca.c
@@ -238,8 +238,7 @@ static void execute_one(void);
 
 static void loop(void)
 {
-  int iter;
-  for (iter = 0;; iter++) {
+  for (;;) {
     int pid = fork();
     if (pid < 0)
       exit(1);
diff --git a/test/rw_merge_test.c b/test/rw_merge_test.c
index 43feed41..03f6467d 100644
--- a/test/rw_merge_test.c
+++ b/test/rw_merge_test.c
@@ -35,7 +35,8 @@ int main(int argc, char *argv[])
 	assert(!ret);
 
 	fd = open("testfile", O_RDWR | O_CREAT, 0644);
-	assert(ret >= 0);
+	assert(fd >= 0);
+	unlink("testfile");
 	ret = ftruncate(fd, 4096);
 	assert(!ret);
 
diff --git a/test/submit-reuse.c b/test/submit-reuse.c
index ca30e98a..d5ccdd44 100644
--- a/test/submit-reuse.c
+++ b/test/submit-reuse.c
@@ -26,13 +26,11 @@ struct thread_data {
 static void *flusher(void *__data)
 {
 	struct thread_data *data = __data;
-	int i = 0;
 
 	while (!data->do_exit) {
 		posix_fadvise(data->fd1, 0, FILE_SIZE, POSIX_FADV_DONTNEED);
 		posix_fadvise(data->fd2, 0, FILE_SIZE, POSIX_FADV_DONTNEED);
 		usleep(10);
-		i++;
 	}
 
 	return NULL;