diff --git a/tests/gem_double_irq_loop.c b/tests/gem_double_irq_loop.c
index e1be24f0..f6811c97 100644
--- a/tests/gem_double_irq_loop.c
+++ b/tests/gem_double_irq_loop.c
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
 	devid = intel_get_drm_devid(fd);
 	if (!HAS_BLT_RING(devid)) {
 		fprintf(stderr, "not (yet) implemented for pre-snb\n");
-		goto out;
+		return 77;
 	}
 
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
@@ -141,7 +141,6 @@ int main(int argc, char **argv)
 	intel_batchbuffer_free(batch);
 	drm_intel_bufmgr_destroy(bufmgr);
 
-out:
 	close(fd);
 
 	return 0;
diff --git a/tests/gem_dummy_reloc_loop.c b/tests/gem_dummy_reloc_loop.c
index bec54e17..82d8f77e 100644
--- a/tests/gem_dummy_reloc_loop.c
+++ b/tests/gem_dummy_reloc_loop.c
@@ -136,7 +136,7 @@ int main(int argc, char **argv)
 	devid = intel_get_drm_devid(fd);
 	if (!HAS_BLT_RING(devid)) {
 		fprintf(stderr, "not (yet) implemented for pre-snb\n");
-		goto out;
+		return 77;
 	}
 
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
@@ -188,7 +188,6 @@ skip:
 	intel_batchbuffer_free(batch);
 	drm_intel_bufmgr_destroy(bufmgr);
 
-out:
 	close(fd);
 
 	return 0;
diff --git a/tests/gem_pipe_control_store_loop.c b/tests/gem_pipe_control_store_loop.c
index f8cdb9fe..4907c04f 100644
--- a/tests/gem_pipe_control_store_loop.c
+++ b/tests/gem_pipe_control_store_loop.c
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
 
 	if (IS_GEN2(devid) || IS_GEN3(devid)) {
 		fprintf(stderr, "no pipe_control on gen2/3\n");
-		goto out;
+		return 77;
 	}
 	/* IMPORTANT: No call to
 	 * drm_intel_bufmgr_gem_enable_reuse(bufmgr);
@@ -170,7 +170,6 @@ int main(int argc, char **argv)
 	store_pipe_control_loop();
 
 	intel_batchbuffer_free(batch);
-out:
 	drm_intel_bufmgr_destroy(bufmgr);
 
 	close(fd);
diff --git a/tests/gem_ring_sync_loop.c b/tests/gem_ring_sync_loop.c
index 7837557d..a415715e 100644
--- a/tests/gem_ring_sync_loop.c
+++ b/tests/gem_ring_sync_loop.c
@@ -104,7 +104,7 @@ int main(int argc, char **argv)
 	devid = intel_get_drm_devid(fd);
 	if (!HAS_BLT_RING(devid)) {
 		fprintf(stderr, "inter ring check needs gen6+\n");
-		goto out;
+		return 77;
 	}
 
 
@@ -133,7 +133,6 @@ int main(int argc, char **argv)
 	intel_batchbuffer_free(batch);
 	drm_intel_bufmgr_destroy(bufmgr);
 
-out:
 	close(fd);
 
 	return 0;
diff --git a/tests/gem_storedw_batches_loop.c b/tests/gem_storedw_batches_loop.c
index 77a41564..5ee0cee3 100644
--- a/tests/gem_storedw_batches_loop.c
+++ b/tests/gem_storedw_batches_loop.c
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
 
 		fprintf(stderr, "MI_STORE_DATA can only use GTT address on gen4+/g33 and"
 			"needs snoopable mem on pre-gen6\n");
-		goto out;
+		return 77;
 	}
 
 
@@ -160,7 +160,6 @@ int main(int argc, char **argv)
 	drm_intel_bo_unreference(target_bo);
 	drm_intel_bufmgr_destroy(bufmgr);
 
-out:
 	close(fd);
 
 	return 0;
diff --git a/tests/gem_storedw_loop_blt.c b/tests/gem_storedw_loop_blt.c
index 702267dc..d12e1fc8 100644
--- a/tests/gem_storedw_loop_blt.c
+++ b/tests/gem_storedw_loop_blt.c
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
 
 		fprintf(stderr, "MI_STORE_DATA can only use GTT address on gen4+/g33 and "
 			"needs snoopable mem on pre-gen6\n");
-		goto out;
+		return 77;
 	}
 
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
@@ -135,7 +135,6 @@ int main(int argc, char **argv)
 	intel_batchbuffer_free(batch);
 	drm_intel_bufmgr_destroy(bufmgr);
 
-out:
 	close(fd);
 
 	return 0;
diff --git a/tests/gem_storedw_loop_bsd.c b/tests/gem_storedw_loop_bsd.c
index 1221e614..56c52dab 100644
--- a/tests/gem_storedw_loop_bsd.c
+++ b/tests/gem_storedw_loop_bsd.c
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
 
 		fprintf(stderr, "MI_STORE_DATA can only use GTT address on gen4+/g33 and "
 			"needs snoopable mem on pre-gen6\n");
-		goto out;
+		return 77;
 	}
 
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
@@ -135,7 +135,6 @@ int main(int argc, char **argv)
 	intel_batchbuffer_free(batch);
 	drm_intel_bufmgr_destroy(bufmgr);
 
-out:
 	close(fd);
 
 	return 0;
diff --git a/tests/gem_storedw_loop_render.c b/tests/gem_storedw_loop_render.c
index 06b8fcc3..2cbb5307 100644
--- a/tests/gem_storedw_loop_render.c
+++ b/tests/gem_storedw_loop_render.c
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
 
 		fprintf(stderr, "MI_STORE_DATA can only use GTT address on gen4+/g33 and "
 			"needs snoopable mem on pre-gen6\n");
-		goto out;
+		return 77;
 	}
 
 	bufmgr = drm_intel_bufmgr_gem_init(fd, 4096);
@@ -135,7 +135,6 @@ int main(int argc, char **argv)
 	intel_batchbuffer_free(batch);
 	drm_intel_bufmgr_destroy(bufmgr);
 
-out:
 	close(fd);
 
 	return 0;
diff --git a/tests/gen3_mixed_blits.c b/tests/gen3_mixed_blits.c
index 28c15419..997a7b73 100644
--- a/tests/gen3_mixed_blits.c
+++ b/tests/gen3_mixed_blits.c
@@ -548,7 +548,7 @@ int main(int argc, char **argv)
 
 	if (!IS_GEN3(intel_get_drm_devid(fd))) {
 		printf("gen3-only test, doing nothing\n");
-		return 0;
+		return 77;
 	}
 
 	count = 0;
diff --git a/tests/gen3_render_linear_blits.c b/tests/gen3_render_linear_blits.c
index a4d8e2b0..33dee69c 100644
--- a/tests/gen3_render_linear_blits.c
+++ b/tests/gen3_render_linear_blits.c
@@ -396,7 +396,7 @@ int main(int argc, char **argv)
 
 	if (!IS_GEN3(intel_get_drm_devid(fd))) {
 		printf("gen3-only test, doing nothing\n");
-		return 0;
+		return 77;
 	}
 
 	count = 0;
diff --git a/tests/gen3_render_mixed_blits.c b/tests/gen3_render_mixed_blits.c
index dce8b98b..8439e06d 100644
--- a/tests/gen3_render_mixed_blits.c
+++ b/tests/gen3_render_mixed_blits.c
@@ -437,7 +437,7 @@ int main(int argc, char **argv)
 
 	if (!IS_GEN3(intel_get_drm_devid(fd))) {
 		printf("gen3-only test, doing nothing\n");
-		return 0;
+		return 77;
 	}
 
 	count = 0;
diff --git a/tests/gen3_render_tiledx_blits.c b/tests/gen3_render_tiledx_blits.c
index 7c44607f..a6c72a66 100644
--- a/tests/gen3_render_tiledx_blits.c
+++ b/tests/gen3_render_tiledx_blits.c
@@ -424,7 +424,7 @@ int main(int argc, char **argv)
 
 	if (!IS_GEN3(intel_get_drm_devid(fd))) {
 		printf("gen3-only test, doing nothing\n");
-		return 0;
+		return 77;
 	}
 
 	count = 0;
diff --git a/tests/gen3_render_tiledy_blits.c b/tests/gen3_render_tiledy_blits.c
index 43a53b65..11c00c28 100644
--- a/tests/gen3_render_tiledy_blits.c
+++ b/tests/gen3_render_tiledy_blits.c
@@ -424,7 +424,7 @@ int main(int argc, char **argv)
 
 	if (!IS_GEN3(intel_get_drm_devid(fd))) {
 		printf("gen3-only test, doing nothing\n");
-		return 0;
+		return 77;
 	}
 
 	count = 0;