diff --git a/tests/debugfs_pipe_crc.c b/tests/debugfs_pipe_crc.c
index 6a3e9dc5..1bb34dc6 100644
--- a/tests/debugfs_pipe_crc.c
+++ b/tests/debugfs_pipe_crc.c
@@ -268,5 +268,5 @@ int main(int argc, char **argv)
 		fclose(data.ctl);
 	}
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c
index 9c3391e4..c812a5b9 100644
--- a/tests/gem_mmap.c
+++ b/tests/gem_mmap.c
@@ -97,5 +97,5 @@ int main(int argc, char **argv)
 	igt_fixture
 		close(fd);
 
-	return 0;
+	igt_exit();
 }
diff --git a/tests/gem_storedw_batches_loop.c b/tests/gem_storedw_batches_loop.c
index d6cd216f..eabc6f26 100644
--- a/tests/gem_storedw_batches_loop.c
+++ b/tests/gem_storedw_batches_loop.c
@@ -167,5 +167,5 @@ int main(int argc, char **argv)
 		close(fd);
 	}
 
-	return 0;
+	igt_exit();
 }