Convert simple if(piglit_get_gl_version() < N) { SKIP } to require

Generated from the following semantic patch:

@@
expression VER;
expression MSG;
@@

-	if (piglit_get_gl_version() < VER) {
-		printf(MSG);
-		piglit_report_result(PIGLIT_SKIP);
(
-		exit(1);
|
)
-	}

+   piglit_require_gl_version(VER);

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>

157 files changed, 157 insertions, 634 deletions

diff --git a/tests/bugs/fdo25614-genmipmap.c b/tests/bugs/fdo25614-genmipmap.c
index 43a7042e..804ac9b8 100644
--- a/tests/bugs/fdo25614-genmipmap.c
+++ b/tests/bugs/fdo25614-genmipmap.c
@@ -61,10 +61,7 @@ piglit_init(int argc, char **argv)
 	(void) argc;
 	(void) argv;
 
-	if (piglit_get_gl_version() < 14) {
-		printf("Requires OpenGL 1.4\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(14);
 
 	loadTex();
 
diff --git a/tests/bugs/fdo31934.c b/tests/bugs/fdo31934.c
index c5b8392f..c1960e3a 100644
--- a/tests/bugs/fdo31934.c
+++ b/tests/bugs/fdo31934.c
@@ -10,10 +10,7 @@ piglit_init(int argc, char *argv[])
 {
     GLuint id;
 
-    if (piglit_get_gl_version() < 15) {
-        printf("Requires OpenGL 1.5\n");
-        piglit_report_result(PIGLIT_SKIP);
-    }
+    piglit_require_gl_version(15);
 
     piglit_require_extension("GL_ARB_vertex_buffer_object");
 
diff --git a/tests/fbo/fbo-alphatest-nocolor.c b/tests/fbo/fbo-alphatest-nocolor.c
index 1794fd2a..aec40955 100644
--- a/tests/fbo/fbo-alphatest-nocolor.c
+++ b/tests/fbo/fbo-alphatest-nocolor.c
@@ -162,10 +162,7 @@ void piglit_init(int argc, char **argv)
 {
 	GLuint fs, vs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_framebuffer_object");
 
diff --git a/tests/fbo/fbo-copypix.c b/tests/fbo/fbo-copypix.c
index 7dc0e595..f34cbf2c 100644
--- a/tests/fbo/fbo-copypix.c
+++ b/tests/fbo/fbo-copypix.c
@@ -211,10 +211,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 14) {
-		printf("Requires OpenGL 1.4\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(14);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/fbo/fbo-drawbuffers-blend-add.c b/tests/fbo/fbo-drawbuffers-blend-add.c
index 76bf3244..158cb9e2 100644
--- a/tests/fbo/fbo-drawbuffers-blend-add.c
+++ b/tests/fbo/fbo-drawbuffers-blend-add.c
@@ -230,10 +230,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_framebuffer_object");
 	piglit_require_extension("GL_ARB_draw_buffers");
diff --git a/tests/fbo/fbo-drawbuffers-fragcolor.c b/tests/fbo/fbo-drawbuffers-fragcolor.c
index f93a4377..167855d6 100644
--- a/tests/fbo/fbo-drawbuffers-fragcolor.c
+++ b/tests/fbo/fbo-drawbuffers-fragcolor.c
@@ -179,10 +179,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_framebuffer_object");
 	piglit_require_extension("GL_ARB_draw_buffers");
diff --git a/tests/fbo/fbo-drawbuffers-maxtargets.c b/tests/fbo/fbo-drawbuffers-maxtargets.c
index e9700985..b3227bfe 100644
--- a/tests/fbo/fbo-drawbuffers-maxtargets.c
+++ b/tests/fbo/fbo-drawbuffers-maxtargets.c
@@ -187,10 +187,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_framebuffer_object");
 	piglit_require_extension("GL_ARB_draw_buffers");
diff --git a/tests/fbo/fbo-fragcoord.c b/tests/fbo/fbo-fragcoord.c
index cfd7be2e..0547b9f3 100644
--- a/tests/fbo/fbo-fragcoord.c
+++ b/tests/fbo/fbo-fragcoord.c
@@ -141,10 +141,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-mvp.vert");
diff --git a/tests/fbo/fbo-fragcoord2.c b/tests/fbo/fbo-fragcoord2.c
index 9277e586..82d439cf 100644
--- a/tests/fbo/fbo-fragcoord2.c
+++ b/tests/fbo/fbo-fragcoord2.c
@@ -209,10 +209,7 @@ piglit_init(int argc, char**argv)
 {
    GLuint vs, fs;
 
-   if (piglit_get_gl_version() < 20) {
-      printf("Requires OpenGL 2.0\n");
-      piglit_report_result(PIGLIT_SKIP);
-   }
+   piglit_require_gl_version(20);
 
    piglit_require_extension("GL_ARB_framebuffer_object");
 
diff --git a/tests/fbo/fbo-readdrawpix.c b/tests/fbo/fbo-readdrawpix.c
index bc0c96fb..5aa6b3e6 100644
--- a/tests/fbo/fbo-readdrawpix.c
+++ b/tests/fbo/fbo-readdrawpix.c
@@ -214,10 +214,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 14) {
-		printf("Requires OpenGL 1.4\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(14);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/general/bgra-sec-color-pointer.c b/tests/general/bgra-sec-color-pointer.c
index 6e5fc194..7b3821cf 100644
--- a/tests/general/bgra-sec-color-pointer.c
+++ b/tests/general/bgra-sec-color-pointer.c
@@ -52,10 +52,7 @@ static GLubyte colors[16] = {255, 0, 0, 127,
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 14) {
-		printf("Requires OpenGL 1.4\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(14);
 
 	piglit_require_extension("GL_EXT_vertex_array_bgra");
 
diff --git a/tests/general/bgra-vert-attrib-pointer.c b/tests/general/bgra-vert-attrib-pointer.c
index f3703c3f..54048763 100644
--- a/tests/general/bgra-vert-attrib-pointer.c
+++ b/tests/general/bgra-vert-attrib-pointer.c
@@ -110,10 +110,7 @@ compileLinkProg(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_vertex_array_bgra");
 
diff --git a/tests/general/blendminmax.c b/tests/general/blendminmax.c
index c4fc442f..9f698805 100644
--- a/tests/general/blendminmax.c
+++ b/tests/general/blendminmax.c
@@ -132,10 +132,7 @@ piglit_init(int argc, char **argv)
 		piglit_report_result(PIGLIT_SKIP);
 	}
 
-	if (piglit_get_gl_version() < 14) {
-		printf("Requires OpenGL 1.4\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(14);
 
 	printf("\nAll 4 quads should be the same color.\n");
 	glEnable(GL_BLEND);
diff --git a/tests/general/clear-varray-2.0.c b/tests/general/clear-varray-2.0.c
index 697cd3f0..e13b29ce 100644
--- a/tests/general/clear-varray-2.0.c
+++ b/tests/general/clear-varray-2.0.c
@@ -129,10 +129,7 @@ piglit_init(int argc, char **argv)
 {
 	GLuint vert_prog, frag_prog;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	reshape(piglit_width, piglit_height);
 
diff --git a/tests/general/draw-batch.c b/tests/general/draw-batch.c
index c21b8b7b..6c9b105a 100644
--- a/tests/general/draw-batch.c
+++ b/tests/general/draw-batch.c
@@ -32,10 +32,7 @@ PIGLIT_GL_TEST_MAIN(
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 14) {
-		printf("Requires OpenGL 1.4.\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(14);
 }
 
 static void rotate_colors(float *array)
diff --git a/tests/general/draw-elements-base-vertex-neg.c b/tests/general/draw-elements-base-vertex-neg.c
index 6e7b260b..ebb72fc4 100644
--- a/tests/general/draw-elements-base-vertex-neg.c
+++ b/tests/general/draw-elements-base-vertex-neg.c
@@ -46,10 +46,7 @@ void piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 15) {
-		printf("Requires OpenGL 1.5\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(15);
 
 	piglit_require_extension("GL_ARB_draw_elements_base_vertex");
 
diff --git a/tests/general/draw-elements-vs-inputs.c b/tests/general/draw-elements-vs-inputs.c
index ff116269..4c73fff4 100644
--- a/tests/general/draw-elements-vs-inputs.c
+++ b/tests/general/draw-elements-vs-inputs.c
@@ -49,10 +49,7 @@ piglit_init(int argc, char **argv)
 {
    GLfloat red[4] = {1, 0, 0, 1};
 
-   if (piglit_get_gl_version() < 12) {
-      printf("Requires OpenGL 1.2\n");
-      piglit_report_result(PIGLIT_SKIP);
-   }
+   piglit_require_gl_version(12);
 
    glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, red);
 
diff --git a/tests/general/draw-elements.c b/tests/general/draw-elements.c
index b2bfbd5c..32cdf921 100644
--- a/tests/general/draw-elements.c
+++ b/tests/general/draw-elements.c
@@ -51,10 +51,7 @@ void piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 15) {
-		printf("Requires OpenGL 1.5\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(15);
 
 	glShadeModel(GL_FLAT);
 	glClearColor(0.2, 0.2, 0.2, 1.0);
diff --git a/tests/general/draw-vertices-half-float.c b/tests/general/draw-vertices-half-float.c
index b81b19c2..c962ebf1 100644
--- a/tests/general/draw-vertices-half-float.c
+++ b/tests/general/draw-vertices-half-float.c
@@ -51,10 +51,7 @@ void piglit_init(int argc, char **argv)
 
     piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-    if (piglit_get_gl_version() < 15) {
-        printf("Requires OpenGL 1.5\n");
-        piglit_report_result(PIGLIT_SKIP);
-    }
+    piglit_require_gl_version(15);
     piglit_require_extension("GL_ARB_half_float_vertex");
 
     glShadeModel(GL_FLAT);
diff --git a/tests/general/draw-vertices.c b/tests/general/draw-vertices.c
index 03d602e2..70f1bd7f 100644
--- a/tests/general/draw-vertices.c
+++ b/tests/general/draw-vertices.c
@@ -51,10 +51,7 @@ void piglit_init(int argc, char **argv)
 
     piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-    if (piglit_get_gl_version() < 15) {
-        printf("Requires OpenGL 1.5\n");
-        piglit_report_result(PIGLIT_SKIP);
-    }
+    piglit_require_gl_version(15);
 
     glShadeModel(GL_FLAT);
     glClearColor(0.2, 0.2, 0.2, 1.0);
diff --git a/tests/general/early-z.c b/tests/general/early-z.c
index 036fe528..99578968 100644
--- a/tests/general/early-z.c
+++ b/tests/general/early-z.c
@@ -144,10 +144,7 @@ piglit_init(int argc, char **argv)
 {
    int i;
 
-   if (piglit_get_gl_version() < 20) {
-      printf("Requires OpenGL 2.0 / GLSL\n");
-      piglit_report_result(PIGLIT_SKIP);
-   }
+   piglit_require_gl_version(20);
 
    shader[0] = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fpFragDepthText);
    assert(shader[0]);
diff --git a/tests/general/isbufferobj.c b/tests/general/isbufferobj.c
index 45b3246b..be2a0900 100644
--- a/tests/general/isbufferobj.c
+++ b/tests/general/isbufferobj.c
@@ -101,8 +101,5 @@ piglit_display(void)
 void
 piglit_init(int argc, char**argv)
 {
-   if (piglit_get_gl_version() < 15) {
-      printf("Requires OpenGL 1.5\n");
-      piglit_report_result(PIGLIT_SKIP);
-   }
+   piglit_require_gl_version(15);
 }
diff --git a/tests/general/occlusion-query-discard.c b/tests/general/occlusion-query-discard.c
index 4cf3de93..144f70bc 100644
--- a/tests/general/occlusion-query-discard.c
+++ b/tests/general/occlusion-query-discard.c
@@ -128,10 +128,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint query_bits;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	/* It is legal for a driver to support the query API but not have
 	 * any query bits.  I wonder how many applications actually check for
diff --git a/tests/general/texunits.c b/tests/general/texunits.c
index 01264c94..cfe80123 100644
--- a/tests/general/texunits.c
+++ b/tests/general/texunits.c
@@ -384,10 +384,7 @@ init(void)
 void
 piglit_init(int argc, char *argv[])
 {
-   if (piglit_get_gl_version() < 13) {
-	   printf("Requires OpenGL 1.3\n");
-	   piglit_report_result(PIGLIT_SKIP);
-   }
+   piglit_require_gl_version(13);
 
    init();
 }
diff --git a/tests/general/vao-element-array-buffer.c b/tests/general/vao-element-array-buffer.c
index 6e9f8c05..103f2477 100644
--- a/tests/general/vao-element-array-buffer.c
+++ b/tests/general/vao-element-array-buffer.c
@@ -69,10 +69,7 @@ piglit_init(int argc, char **argv)
 	};
 	GLubyte indices[] = {0, 1, 2, 3};
 
-	if (piglit_get_gl_version() < 15) {
-		printf("Requires OpenGL 1.5\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(15);
 
 	piglit_require_extension("GL_ARB_vertex_array_object");
 
diff --git a/tests/shaders/activeprogram-bad-program.c b/tests/shaders/activeprogram-bad-program.c
index b9160b49..b6bf0431 100644
--- a/tests/shaders/activeprogram-bad-program.c
+++ b/tests/shaders/activeprogram-bad-program.c
@@ -56,10 +56,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint vs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/activeprogram-get.c b/tests/shaders/activeprogram-get.c
index bdc70144..cf0d2f93 100644
--- a/tests/shaders/activeprogram-get.c
+++ b/tests/shaders/activeprogram-get.c
@@ -51,10 +51,7 @@ piglit_init(int argc, char **argv)
 	GLuint got;
 	GLuint vs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/createshaderprogram-attached-shaders.c b/tests/shaders/createshaderprogram-attached-shaders.c
index a1a105f7..d988fdf3 100644
--- a/tests/shaders/createshaderprogram-attached-shaders.c
+++ b/tests/shaders/createshaderprogram-attached-shaders.c
@@ -52,10 +52,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLenum err;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/createshaderprogram-bad-type.c b/tests/shaders/createshaderprogram-bad-type.c
index 5eace087..ab5ba2b3 100644
--- a/tests/shaders/createshaderprogram-bad-type.c
+++ b/tests/shaders/createshaderprogram-bad-type.c
@@ -112,10 +112,7 @@ piglit_init(int argc, char **argv)
 		? 0 : GL_INVALID_ENUM;
 	GLboolean pass;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/fp-fragment-position.c b/tests/shaders/fp-fragment-position.c
index b72ac96f..cc15b77e 100644
--- a/tests/shaders/fp-fragment-position.c
+++ b/tests/shaders/fp-fragment-position.c
@@ -271,10 +271,7 @@ piglit_init(int argc, char **argv)
 	GLubyte rectangle[200][200][4];
 	GLubyte tex[256*256][4];
 
-	if (piglit_get_gl_version() < 13) {
-		printf("Requires OpenGL 1.3\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(13);
 
 	printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
 
diff --git a/tests/shaders/fp-kil.c b/tests/shaders/fp-kil.c
index cb25e5fe..297c6287 100644
--- a/tests/shaders/fp-kil.c
+++ b/tests/shaders/fp-kil.c
@@ -240,10 +240,7 @@ piglit_init(int argc, char **argv)
 	GLuint texname;
 	GLubyte tex[4][4][4];
 
-	if (piglit_get_gl_version() < 13) {
-		printf("Requires OpenGL 1.3\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(13);
 
 	printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
 
diff --git a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
index 42a9c041..4943ec5a 100644
--- a/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
+++ b/tests/shaders/glsl-arb-fragment-coord-conventions-define.c
@@ -63,10 +63,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_fragment_coord_conventions");
 
diff --git a/tests/shaders/glsl-bindattriblocation.c b/tests/shaders/glsl-bindattriblocation.c
index 62b0f13c..cda840e8 100644
--- a/tests/shaders/glsl-bindattriblocation.c
+++ b/tests/shaders/glsl-bindattriblocation.c
@@ -127,9 +127,5 @@ piglit_init(int argc, char **argv)
 {
 	piglit_require_vertex_shader();
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-		exit(1);
-	}
+	piglit_require_gl_version(20);
 }
diff --git a/tests/shaders/glsl-cos.c b/tests/shaders/glsl-cos.c
index 3390dced..8a9ea5d9 100644
--- a/tests/shaders/glsl-cos.c
+++ b/tests/shaders/glsl-cos.c
@@ -111,9 +111,6 @@ enum piglit_result piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-        printf("Requires OpenGL 2.0\n");
-        piglit_report_result(PIGLIT_SKIP);
-    }
+	piglit_require_gl_version(20);
 }
 
diff --git a/tests/shaders/glsl-deriv-varyings.c b/tests/shaders/glsl-deriv-varyings.c
index 7a8c81f0..c8f2bbf4 100644
--- a/tests/shaders/glsl-deriv-varyings.c
+++ b/tests/shaders/glsl-deriv-varyings.c
@@ -89,10 +89,7 @@ static const char *fragShaderText2 =
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	compileLinkProg();
 
diff --git a/tests/shaders/glsl-derivs.c b/tests/shaders/glsl-derivs.c
index 76e926a4..5e25d93c 100644
--- a/tests/shaders/glsl-derivs.c
+++ b/tests/shaders/glsl-derivs.c
@@ -88,10 +88,7 @@ static const char *fragShaderText2 =
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-dlist-getattriblocation.c b/tests/shaders/glsl-dlist-getattriblocation.c
index 0490bfbf..a56a1f91 100644
--- a/tests/shaders/glsl-dlist-getattriblocation.c
+++ b/tests/shaders/glsl-dlist-getattriblocation.c
@@ -96,11 +96,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-		exit(1);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 }
diff --git a/tests/shaders/glsl-empty-vs-no-fs.c b/tests/shaders/glsl-empty-vs-no-fs.c
index 4a6d19a1..bfe2444f 100644
--- a/tests/shaders/glsl-empty-vs-no-fs.c
+++ b/tests/shaders/glsl-empty-vs-no-fs.c
@@ -75,8 +75,5 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 }
diff --git a/tests/shaders/glsl-explicit-location-01.c b/tests/shaders/glsl-explicit-location-01.c
index ce39e73a..0b8b31b5 100644
--- a/tests/shaders/glsl-explicit-location-01.c
+++ b/tests/shaders/glsl-explicit-location-01.c
@@ -50,10 +50,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog;
 	GLboolean ok;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_explicit_attrib_location");
 
diff --git a/tests/shaders/glsl-explicit-location-02.c b/tests/shaders/glsl-explicit-location-02.c
index 28f35716..93084fa8 100644
--- a/tests/shaders/glsl-explicit-location-02.c
+++ b/tests/shaders/glsl-explicit-location-02.c
@@ -53,10 +53,7 @@ void piglit_init(int argc, char **argv)
 	GLint loc;
 	GLboolean ok;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_explicit_attrib_location");
 
diff --git a/tests/shaders/glsl-explicit-location-03.c b/tests/shaders/glsl-explicit-location-03.c
index 18be4c62..7661ea42 100644
--- a/tests/shaders/glsl-explicit-location-03.c
+++ b/tests/shaders/glsl-explicit-location-03.c
@@ -50,10 +50,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog;
 	GLboolean ok;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_explicit_attrib_location");
 
diff --git a/tests/shaders/glsl-explicit-location-04.c b/tests/shaders/glsl-explicit-location-04.c
index c570f261..a5c99ca0 100644
--- a/tests/shaders/glsl-explicit-location-04.c
+++ b/tests/shaders/glsl-explicit-location-04.c
@@ -47,10 +47,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog;
 	GLboolean ok;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_explicit_attrib_location");
 
diff --git a/tests/shaders/glsl-explicit-location-05.c b/tests/shaders/glsl-explicit-location-05.c
index 60ba27da..bf79900e 100644
--- a/tests/shaders/glsl-explicit-location-05.c
+++ b/tests/shaders/glsl-explicit-location-05.c
@@ -52,10 +52,7 @@ void piglit_init(int argc, char **argv)
 	GLboolean ok;
 	GLint loc;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_explicit_attrib_location");
 
diff --git a/tests/shaders/glsl-fs-bug25902.c b/tests/shaders/glsl-fs-bug25902.c
index 743e615c..a5052496 100644
--- a/tests/shaders/glsl-fs-bug25902.c
+++ b/tests/shaders/glsl-fs-bug25902.c
@@ -74,10 +74,7 @@ piglit_init(int argc, char **argv)
 	float black[4] = {0.0, 0.0, 0.0, 0.0};
 	float white[4] = {1.0, 1.0, 1.0, 0.0};
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-fs-exp2.c b/tests/shaders/glsl-fs-exp2.c
index 862ae90e..4ecd8705 100644
--- a/tests/shaders/glsl-fs-exp2.c
+++ b/tests/shaders/glsl-fs-exp2.c
@@ -68,10 +68,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-fs-flat-color.c b/tests/shaders/glsl-fs-flat-color.c
index 1ad92857..fa5cbca9 100644
--- a/tests/shaders/glsl-fs-flat-color.c
+++ b/tests/shaders/glsl-fs-flat-color.c
@@ -96,10 +96,7 @@ piglit_init(int argc, char **argv)
 {
 	GLuint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-color-mvp.vert");
diff --git a/tests/shaders/glsl-fs-fogcolor-statechange.c b/tests/shaders/glsl-fs-fogcolor-statechange.c
index d3374c2c..4a8aa5ba 100644
--- a/tests/shaders/glsl-fs-fogcolor-statechange.c
+++ b/tests/shaders/glsl-fs-fogcolor-statechange.c
@@ -72,10 +72,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = gl_Fog.color;\n"
 		"}\n";
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-mvp.vert");
diff --git a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c
index bdde679b..5bd317ef 100644
--- a/tests/shaders/glsl-fs-fragcoord-zw-ortho.c
+++ b/tests/shaders/glsl-fs-fragcoord-zw-ortho.c
@@ -115,10 +115,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs, prog;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c
index b00f23ac..8d16693e 100644
--- a/tests/shaders/glsl-fs-fragcoord-zw-perspective.c
+++ b/tests/shaders/glsl-fs-fragcoord-zw-perspective.c
@@ -137,10 +137,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs, prog;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
diff --git a/tests/shaders/glsl-fs-fragcoord.c b/tests/shaders/glsl-fs-fragcoord.c
index 3e06d566..dbbfd135 100644
--- a/tests/shaders/glsl-fs-fragcoord.c
+++ b/tests/shaders/glsl-fs-fragcoord.c
@@ -74,10 +74,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-fs-loop-nested.c b/tests/shaders/glsl-fs-loop-nested.c
index e6a70c48..bb3d9cc6 100644
--- a/tests/shaders/glsl-fs-loop-nested.c
+++ b/tests/shaders/glsl-fs-loop-nested.c
@@ -106,10 +106,7 @@ piglit_init(int argc, char **argv)
 	 */
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-mvp.vert");
diff --git a/tests/shaders/glsl-fs-loop.c b/tests/shaders/glsl-fs-loop.c
index c86fa8ac..559f2354 100644
--- a/tests/shaders/glsl-fs-loop.c
+++ b/tests/shaders/glsl-fs-loop.c
@@ -104,10 +104,7 @@ piglit_init(int argc, char **argv)
 	 */
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-mvp.vert");
diff --git a/tests/shaders/glsl-fs-mix-constant.c b/tests/shaders/glsl-fs-mix-constant.c
index db10bbd4..e98391c5 100644
--- a/tests/shaders/glsl-fs-mix-constant.c
+++ b/tests/shaders/glsl-fs-mix-constant.c
@@ -63,10 +63,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-fs-mix.c b/tests/shaders/glsl-fs-mix.c
index fb24b525..23745061 100644
--- a/tests/shaders/glsl-fs-mix.c
+++ b/tests/shaders/glsl-fs-mix.c
@@ -70,10 +70,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-fs-pointcoord.c b/tests/shaders/glsl-fs-pointcoord.c
index 707475a7..e0966585 100644
--- a/tests/shaders/glsl-fs-pointcoord.c
+++ b/tests/shaders/glsl-fs-pointcoord.c
@@ -86,11 +86,7 @@ void piglit_init(int argc, char**argv)
 	GLint vs, fs;
 	GLint point_size_limits[2];
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-		exit(1);
-	}
+	piglit_require_gl_version(20);
 	piglit_require_extension("GL_ARB_point_sprite");
 
 	glGetIntegerv(GL_ALIASED_POINT_SIZE_RANGE, point_size_limits);
diff --git a/tests/shaders/glsl-fs-raytrace-bug27060.c b/tests/shaders/glsl-fs-raytrace-bug27060.c
index ad7d801f..966a476f 100644
--- a/tests/shaders/glsl-fs-raytrace-bug27060.c
+++ b/tests/shaders/glsl-fs-raytrace-bug27060.c
@@ -282,10 +282,7 @@ piglit_init(int argc, char **argv)
 
   glDisable(GL_DEPTH_TEST);
 
-  if (piglit_get_gl_version() < 20) {
-    printf("Requires OpenGL 2.0\n");
-    piglit_report_result(PIGLIT_SKIP);
-  }
+  piglit_require_gl_version(20);
 
   glViewport(0, 0, piglit_width, piglit_height);
   glMatrixMode(GL_PROJECTION);
diff --git a/tests/shaders/glsl-fs-sampler-numbering.c b/tests/shaders/glsl-fs-sampler-numbering.c
index 6eedf006..56648a3e 100644
--- a/tests/shaders/glsl-fs-sampler-numbering.c
+++ b/tests/shaders/glsl-fs-sampler-numbering.c
@@ -74,10 +74,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-tex-mvp.vert");
diff --git a/tests/shaders/glsl-fs-shader-stencil-export.c b/tests/shaders/glsl-fs-shader-stencil-export.c
index 7d2a66c4..d27ba596 100644
--- a/tests/shaders/glsl-fs-shader-stencil-export.c
+++ b/tests/shaders/glsl-fs-shader-stencil-export.c
@@ -67,10 +67,7 @@ piglit_init(int argc, char **argv)
 	GLint vs, fs;
 
 	piglit_require_extension("GL_ARB_shader_stencil_export");
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
diff --git a/tests/shaders/glsl-fs-sqrt-branch.c b/tests/shaders/glsl-fs-sqrt-branch.c
index 67ed2aa5..48343834 100644
--- a/tests/shaders/glsl-fs-sqrt-branch.c
+++ b/tests/shaders/glsl-fs-sqrt-branch.c
@@ -68,10 +68,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-fs-texture2drect.c b/tests/shaders/glsl-fs-texture2drect.c
index 94f571a7..764d00ad 100644
--- a/tests/shaders/glsl-fs-texture2drect.c
+++ b/tests/shaders/glsl-fs-texture2drect.c
@@ -140,10 +140,7 @@ void piglit_init(int argc, char **argv)
 			proj4 = GL_TRUE;
 	}
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 	piglit_require_extension("GL_ARB_texture_rectangle");
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
diff --git a/tests/shaders/glsl-fs-texturecube-2.c b/tests/shaders/glsl-fs-texturecube-2.c
index 3b84f5c9..38fa6f82 100644
--- a/tests/shaders/glsl-fs-texturecube-2.c
+++ b/tests/shaders/glsl-fs-texturecube-2.c
@@ -204,10 +204,7 @@ void piglit_init(int argc, char **argv)
 			bias = GL_TRUE;
 	}
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 	piglit_require_extension("GL_ARB_texture_cube_map");
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
diff --git a/tests/shaders/glsl-fs-texturecube.c b/tests/shaders/glsl-fs-texturecube.c
index cf0b7be5..5f54eabc 100644
--- a/tests/shaders/glsl-fs-texturecube.c
+++ b/tests/shaders/glsl-fs-texturecube.c
@@ -167,10 +167,7 @@ void piglit_init(int argc, char **argv)
 			bias = GL_TRUE;
 	}
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 	piglit_require_extension("GL_ARB_texture_cube_map");
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
diff --git a/tests/shaders/glsl-fs-textureenvcolor-statechange.c b/tests/shaders/glsl-fs-textureenvcolor-statechange.c
index 681d8ef5..5b069524 100644
--- a/tests/shaders/glsl-fs-textureenvcolor-statechange.c
+++ b/tests/shaders/glsl-fs-textureenvcolor-statechange.c
@@ -72,10 +72,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = gl_TextureEnvColor[0];\n"
 		"}\n";
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-mvp.vert");
diff --git a/tests/shaders/glsl-fs-user-varying-ff.c b/tests/shaders/glsl-fs-user-varying-ff.c
index bdb44194..771d0fe9 100644
--- a/tests/shaders/glsl-fs-user-varying-ff.c
+++ b/tests/shaders/glsl-fs-user-varying-ff.c
@@ -73,10 +73,7 @@ piglit_init(int argc, char **argv)
 {
 	GLuint fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	glClearColor(0.3, 0.3, 0.3, 0.0);
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
diff --git a/tests/shaders/glsl-fwidth.c b/tests/shaders/glsl-fwidth.c
index ca36512b..26358fd8 100644
--- a/tests/shaders/glsl-fwidth.c
+++ b/tests/shaders/glsl-fwidth.c
@@ -86,10 +86,7 @@ static const char *fragShaderText2 =
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	compileLinkProg();
 
diff --git a/tests/shaders/glsl-getactiveuniform-array-size.c b/tests/shaders/glsl-getactiveuniform-array-size.c
index ddca59f8..a3cfa96b 100644
--- a/tests/shaders/glsl-getactiveuniform-array-size.c
+++ b/tests/shaders/glsl-getactiveuniform-array-size.c
@@ -55,10 +55,7 @@ piglit_init(int argc, char **argv)
 	GLsizei size;
 	GLenum type;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-getactiveuniform-array-size.vert");
diff --git a/tests/shaders/glsl-getactiveuniform-length.c b/tests/shaders/glsl-getactiveuniform-length.c
index 1217c89d..623a59cc 100644
--- a/tests/shaders/glsl-getactiveuniform-length.c
+++ b/tests/shaders/glsl-getactiveuniform-length.c
@@ -56,10 +56,7 @@ piglit_init(int argc, char **argv)
 	char *name;
 	GLsizei size;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-getactiveuniform-length.vert");
diff --git a/tests/shaders/glsl-getattriblocation.c b/tests/shaders/glsl-getattriblocation.c
index 4860cf1d..a444384d 100644
--- a/tests/shaders/glsl-getattriblocation.c
+++ b/tests/shaders/glsl-getattriblocation.c
@@ -115,9 +115,5 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-		exit(1);
-	}
+	piglit_require_gl_version(20);
 }
diff --git a/tests/shaders/glsl-invalid-asm-01.c b/tests/shaders/glsl-invalid-asm-01.c
index b658c6b1..3cf38d77 100644
--- a/tests/shaders/glsl-invalid-asm-01.c
+++ b/tests/shaders/glsl-invalid-asm-01.c
@@ -78,10 +78,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLenum err;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_fragment_program");
 
diff --git a/tests/shaders/glsl-invalid-asm-02.c b/tests/shaders/glsl-invalid-asm-02.c
index 313347dc..5cd3b158 100644
--- a/tests/shaders/glsl-invalid-asm-02.c
+++ b/tests/shaders/glsl-invalid-asm-02.c
@@ -77,10 +77,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLenum err;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_vertex_program");
 
diff --git a/tests/shaders/glsl-kwin-blur-1.c b/tests/shaders/glsl-kwin-blur-1.c
index 36b92cfe..1ab4dc68 100644
--- a/tests/shaders/glsl-kwin-blur-1.c
+++ b/tests/shaders/glsl-kwin-blur-1.c
@@ -229,8 +229,5 @@ enum piglit_result piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-        printf("Requires OpenGL 2.0\n");
-        piglit_report_result(PIGLIT_SKIP);
-    }
+	piglit_require_gl_version(20);
 }
diff --git a/tests/shaders/glsl-kwin-blur-2.c b/tests/shaders/glsl-kwin-blur-2.c
index 042d7a98..adb92c84 100644
--- a/tests/shaders/glsl-kwin-blur-2.c
+++ b/tests/shaders/glsl-kwin-blur-2.c
@@ -260,10 +260,7 @@ void piglit_init(int argc, char **argv)
 {
     int value;
 
-    if (piglit_get_gl_version() < 20) {
-        printf("Requires OpenGL 2.0\n");
-        piglit_report_result(PIGLIT_SKIP);
-    }
+    piglit_require_gl_version(20);
 
     glGetIntegerv(GL_MAX_VARYING_FLOATS, &value);
     if (value < (13 * 4)) {
diff --git a/tests/shaders/glsl-light-model.c b/tests/shaders/glsl-light-model.c
index 82647830..35ff19fe 100644
--- a/tests/shaders/glsl-light-model.c
+++ b/tests/shaders/glsl-light-model.c
@@ -68,10 +68,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_code);
 	fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs_code);
diff --git a/tests/shaders/glsl-link-bug30552.c b/tests/shaders/glsl-link-bug30552.c
index 1997d931..3d848414 100644
--- a/tests/shaders/glsl-link-bug30552.c
+++ b/tests/shaders/glsl-link-bug30552.c
@@ -46,10 +46,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog;
 	GLboolean ok;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vert =
 		piglit_compile_shader(GL_VERTEX_SHADER,
diff --git a/tests/shaders/glsl-link-bug38015.c b/tests/shaders/glsl-link-bug38015.c
index d35c2a04..663eb85f 100644
--- a/tests/shaders/glsl-link-bug38015.c
+++ b/tests/shaders/glsl-link-bug38015.c
@@ -58,10 +58,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog;
 	const char *fs_text_ptr = fs_text;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	/* Intentionally omit check for GL_ARB_shader_texture_lod. */
 
diff --git a/tests/shaders/glsl-link-empty-prog-01.c b/tests/shaders/glsl-link-empty-prog-01.c
index 890fe8e1..70707f31 100644
--- a/tests/shaders/glsl-link-empty-prog-01.c
+++ b/tests/shaders/glsl-link-empty-prog-01.c
@@ -46,8 +46,5 @@ enum piglit_result piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-	printf("Requires OpenGL 2.0\n");
-	piglit_report_result(PIGLIT_SKIP);
-    }
+	piglit_require_gl_version(20);
 }
diff --git a/tests/shaders/glsl-link-empty-prog-02.c b/tests/shaders/glsl-link-empty-prog-02.c
index 0f7545cb..579c1ffe 100644
--- a/tests/shaders/glsl-link-empty-prog-02.c
+++ b/tests/shaders/glsl-link-empty-prog-02.c
@@ -91,10 +91,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	prog = glCreateProgram();
 
diff --git a/tests/shaders/glsl-link-initializer-03.c b/tests/shaders/glsl-link-initializer-03.c
index 345d6c4c..776a012e 100644
--- a/tests/shaders/glsl-link-initializer-03.c
+++ b/tests/shaders/glsl-link-initializer-03.c
@@ -55,10 +55,7 @@ void piglit_init(int argc, char **argv)
 	GLint prog_c;
 	GLint prog_d;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vert[0] =
 		piglit_compile_shader(GL_VERTEX_SHADER,
diff --git a/tests/shaders/glsl-link-test.c b/tests/shaders/glsl-link-test.c
index f0f9e553..56fd636b 100644
--- a/tests/shaders/glsl-link-test.c
+++ b/tests/shaders/glsl-link-test.c
@@ -49,10 +49,7 @@ void piglit_init(int argc, char **argv)
 	unsigned i;
 	const char *invalid_file = NULL;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_GLSL();
 	program = piglit_CreateProgram();
diff --git a/tests/shaders/glsl-lod-bias.c b/tests/shaders/glsl-lod-bias.c
index 28ff2082..ff99099c 100644
--- a/tests/shaders/glsl-lod-bias.c
+++ b/tests/shaders/glsl-lod-bias.c
@@ -80,10 +80,7 @@ static const float pink[4]        = {1.0, 0.0, 1.0, 0.0}; /* Note: 0.0 alpha */
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	loadTex();
 	compileLinkProg();
diff --git a/tests/shaders/glsl-mat-attribute.c b/tests/shaders/glsl-mat-attribute.c
index 6d306e38..f4b51818 100644
--- a/tests/shaders/glsl-mat-attribute.c
+++ b/tests/shaders/glsl-mat-attribute.c
@@ -200,10 +200,7 @@ void piglit_init(int argc, char **argv)
 
 	unsigned i;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-max-varyings.c b/tests/shaders/glsl-max-varyings.c
index a0ad4337..dead8e37 100644
--- a/tests/shaders/glsl-max-varyings.c
+++ b/tests/shaders/glsl-max-varyings.c
@@ -261,10 +261,7 @@ piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	printf("Vertical axis: Increasing numbers of varyings.\n");
 	printf("Horizontal axis: Which of the varyings contains the color.\n");
diff --git a/tests/shaders/glsl-max-vertex-attrib.c b/tests/shaders/glsl-max-vertex-attrib.c
index 19b4b582..f0b1873d 100644
--- a/tests/shaders/glsl-max-vertex-attrib.c
+++ b/tests/shaders/glsl-max-vertex-attrib.c
@@ -152,9 +152,5 @@ enum piglit_result piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-		exit(1);
-	}
+	piglit_require_gl_version(20);
 }
diff --git a/tests/shaders/glsl-novertexdata.c b/tests/shaders/glsl-novertexdata.c
index a77b477c..66253fe0 100644
--- a/tests/shaders/glsl-novertexdata.c
+++ b/tests/shaders/glsl-novertexdata.c
@@ -103,9 +103,5 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-		exit(1);
-	}
+	piglit_require_gl_version(20);
 }
diff --git a/tests/shaders/glsl-orangebook-ch06-bump.c b/tests/shaders/glsl-orangebook-ch06-bump.c
index 8a864018..56e7bcf7 100644
--- a/tests/shaders/glsl-orangebook-ch06-bump.c
+++ b/tests/shaders/glsl-orangebook-ch06-bump.c
@@ -103,10 +103,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-orangebook-ch06-bump.vert");
diff --git a/tests/shaders/glsl-preprocessor-comments.c b/tests/shaders/glsl-preprocessor-comments.c
index cfac79a0..82333a29 100644
--- a/tests/shaders/glsl-preprocessor-comments.c
+++ b/tests/shaders/glsl-preprocessor-comments.c
@@ -68,10 +68,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-routing.c b/tests/shaders/glsl-routing.c
index 8f3092f1..acabde2d 100644
--- a/tests/shaders/glsl-routing.c
+++ b/tests/shaders/glsl-routing.c
@@ -320,9 +320,6 @@ void piglit_init(int argc, char **argv)
 {
     piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-    if (piglit_get_gl_version() < 20) {
-        printf("Requires OpenGL 2.0\n");
-        piglit_report_result(PIGLIT_SKIP);
-    }
+    piglit_require_gl_version(20);
 }
 
diff --git a/tests/shaders/glsl-sin.c b/tests/shaders/glsl-sin.c
index 24f71cb5..2f40f965 100644
--- a/tests/shaders/glsl-sin.c
+++ b/tests/shaders/glsl-sin.c
@@ -111,9 +111,6 @@ enum piglit_result piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-        printf("Requires OpenGL 2.0\n");
-        piglit_report_result(PIGLIT_SKIP);
-    }
+	piglit_require_gl_version(20);
 }
 
diff --git a/tests/shaders/glsl-uniform-update.c b/tests/shaders/glsl-uniform-update.c
index b396b0f8..12439f40 100644
--- a/tests/shaders/glsl-uniform-update.c
+++ b/tests/shaders/glsl-uniform-update.c
@@ -75,10 +75,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-unused-varying.c b/tests/shaders/glsl-unused-varying.c
index 73ac12ab..07474c35 100644
--- a/tests/shaders/glsl-unused-varying.c
+++ b/tests/shaders/glsl-unused-varying.c
@@ -77,10 +77,7 @@ void piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-useprogram-displaylist.c b/tests/shaders/glsl-useprogram-displaylist.c
index f535bc50..1cc2d1f9 100644
--- a/tests/shaders/glsl-useprogram-displaylist.c
+++ b/tests/shaders/glsl-useprogram-displaylist.c
@@ -56,10 +56,7 @@ piglit_init(int argc, char **argv)
 	GLint fsg;
 	GLint vs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	glClearColor(0.2, 0.2, 0.2, 1.0);
 
diff --git a/tests/shaders/glsl-vs-arrays.c b/tests/shaders/glsl-vs-arrays.c
index 6241d949..17f9a016 100644
--- a/tests/shaders/glsl-vs-arrays.c
+++ b/tests/shaders/glsl-vs-arrays.c
@@ -64,10 +64,7 @@ void piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-vs-functions.c b/tests/shaders/glsl-vs-functions.c
index f87ea364..16a0a471 100644
--- a/tests/shaders/glsl-vs-functions.c
+++ b/tests/shaders/glsl-vs-functions.c
@@ -66,10 +66,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-vs-if-bool.c b/tests/shaders/glsl-vs-if-bool.c
index ee2298d3..05d4e878 100644
--- a/tests/shaders/glsl-vs-if-bool.c
+++ b/tests/shaders/glsl-vs-if-bool.c
@@ -67,10 +67,7 @@ void piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-vs-loop-nested.c b/tests/shaders/glsl-vs-loop-nested.c
index 83aad6c5..ec2b043d 100644
--- a/tests/shaders/glsl-vs-loop-nested.c
+++ b/tests/shaders/glsl-vs-loop-nested.c
@@ -105,10 +105,7 @@ piglit_init(int argc, char **argv)
 	 */
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-vs-loop-nested.vert");
diff --git a/tests/shaders/glsl-vs-loop.c b/tests/shaders/glsl-vs-loop.c
index 2338104f..b1f6bf7e 100644
--- a/tests/shaders/glsl-vs-loop.c
+++ b/tests/shaders/glsl-vs-loop.c
@@ -104,10 +104,7 @@ piglit_init(int argc, char **argv)
 	 */
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-vs-loop.vert");
diff --git a/tests/shaders/glsl-vs-mov-after-deref.c b/tests/shaders/glsl-vs-mov-after-deref.c
index 6298eef2..98c0f94c 100644
--- a/tests/shaders/glsl-vs-mov-after-deref.c
+++ b/tests/shaders/glsl-vs-mov-after-deref.c
@@ -64,10 +64,7 @@ void piglit_init(int argc, char **argv)
 {
 	GLint vs, fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-vs-mvp-statechange.c b/tests/shaders/glsl-vs-mvp-statechange.c
index 9a852d87..a8f18345 100644
--- a/tests/shaders/glsl-vs-mvp-statechange.c
+++ b/tests/shaders/glsl-vs-mvp-statechange.c
@@ -74,10 +74,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = vec4(0.0, 1.0, 0.0, 0.0);\n"
 		"}\n";
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
diff --git a/tests/shaders/glsl-vs-normalscale.c b/tests/shaders/glsl-vs-normalscale.c
index add579a0..64c00c00 100644
--- a/tests/shaders/glsl-vs-normalscale.c
+++ b/tests/shaders/glsl-vs-normalscale.c
@@ -69,10 +69,7 @@ void piglit_init(int argc, char **argv)
 	GLint vs, fs;
 	int loc;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-vs-normalscale.vert");
diff --git a/tests/shaders/glsl-vs-point-size.c b/tests/shaders/glsl-vs-point-size.c
index 3ec341c6..7a1c3080 100644
--- a/tests/shaders/glsl-vs-point-size.c
+++ b/tests/shaders/glsl-vs-point-size.c
@@ -87,10 +87,7 @@ piglit_init(int argc, char **argv)
 	GLint vs;
 	GLint point_size_range[2];
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 	/* If the driver doesn't claim to support the point size the
 	   shader is going to set then we should skip the test */
 	glGetIntegerv(GL_ALIASED_POINT_SIZE_RANGE, point_size_range);
diff --git a/tests/shaders/glsl-vs-raytrace-bug26691.c b/tests/shaders/glsl-vs-raytrace-bug26691.c
index 38aeb384..9ed4e454 100644
--- a/tests/shaders/glsl-vs-raytrace-bug26691.c
+++ b/tests/shaders/glsl-vs-raytrace-bug26691.c
@@ -274,10 +274,7 @@ piglit_init(int argc, char **argv)
 
   glDisable(GL_DEPTH_TEST);
 
-  if (piglit_get_gl_version() < 20) {
-    printf("Requires OpenGL 2.0\n");
-    piglit_report_result(PIGLIT_SKIP);
-  }
+  piglit_require_gl_version(20);
 
   glViewport(0, 0, piglit_width, piglit_height);
   glMatrixMode(GL_PROJECTION);
diff --git a/tests/shaders/glsl-vs-statechange-1.c b/tests/shaders/glsl-vs-statechange-1.c
index d84a17f4..3e2a5366 100644
--- a/tests/shaders/glsl-vs-statechange-1.c
+++ b/tests/shaders/glsl-vs-statechange-1.c
@@ -79,10 +79,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint vs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_source);
 
diff --git a/tests/shaders/glsl-vs-texturematrix-1.c b/tests/shaders/glsl-vs-texturematrix-1.c
index 37c3d7f5..013f5568 100644
--- a/tests/shaders/glsl-vs-texturematrix-1.c
+++ b/tests/shaders/glsl-vs-texturematrix-1.c
@@ -84,10 +84,7 @@ void piglit_init(int argc, char **argv)
 	GLint vs, fs;
 	int loc;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-vs-texturematrix-1.vert");
diff --git a/tests/shaders/glsl-vs-texturematrix-2.c b/tests/shaders/glsl-vs-texturematrix-2.c
index b6190e0c..806d01ee 100644
--- a/tests/shaders/glsl-vs-texturematrix-2.c
+++ b/tests/shaders/glsl-vs-texturematrix-2.c
@@ -86,10 +86,7 @@ void piglit_init(int argc, char **argv)
 	GLint vs, fs;
 	int loc;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader(GL_VERTEX_SHADER,
 				   "shaders/glsl-vs-texturematrix-2.vert");
diff --git a/tests/shaders/glsl-vs-user-varying-ff.c b/tests/shaders/glsl-vs-user-varying-ff.c
index 14a5424d..e2739895 100644
--- a/tests/shaders/glsl-vs-user-varying-ff.c
+++ b/tests/shaders/glsl-vs-user-varying-ff.c
@@ -71,10 +71,7 @@ piglit_init(int argc, char **argv)
 {
 	GLuint vs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	glClearColor(0.3, 0.3, 0.3, 0.0);
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
diff --git a/tests/shaders/link-mismatch-layout-01.c b/tests/shaders/link-mismatch-layout-01.c
index 9fff30f1..d7799782 100644
--- a/tests/shaders/link-mismatch-layout-01.c
+++ b/tests/shaders/link-mismatch-layout-01.c
@@ -68,10 +68,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint fs[2];
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_fragment_coord_conventions");
 
diff --git a/tests/shaders/link-mismatch-layout-02.c b/tests/shaders/link-mismatch-layout-02.c
index 8e164e1f..254acb18 100644
--- a/tests/shaders/link-mismatch-layout-02.c
+++ b/tests/shaders/link-mismatch-layout-02.c
@@ -68,10 +68,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint fs[2];
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_AMD_conservative_depth");
 
diff --git a/tests/shaders/link-mismatch-layout-03.c b/tests/shaders/link-mismatch-layout-03.c
index 0cf215bf..e5b7dba2 100644
--- a/tests/shaders/link-mismatch-layout-03.c
+++ b/tests/shaders/link-mismatch-layout-03.c
@@ -66,10 +66,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint fs[2];
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_fragment_coord_conventions");
 
diff --git a/tests/shaders/link-unresolved-function.c b/tests/shaders/link-unresolved-function.c
index f6134e9a..1e7d0d4a 100644
--- a/tests/shaders/link-unresolved-function.c
+++ b/tests/shaders/link-unresolved-function.c
@@ -51,10 +51,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint vs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, bad_vs_text);
 	prog = glCreateProgram();
diff --git a/tests/shaders/sso-simple.c b/tests/shaders/sso-simple.c
index 51a17300..5bf3e8fe 100644
--- a/tests/shaders/sso-simple.c
+++ b/tests/shaders/sso-simple.c
@@ -108,10 +108,7 @@ piglit_init(int argc, char **argv)
 	GLuint vs;
 	GLuint fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/sso-uniforms-01.c b/tests/shaders/sso-uniforms-01.c
index ee753e99..73c408c9 100644
--- a/tests/shaders/sso-uniforms-01.c
+++ b/tests/shaders/sso-uniforms-01.c
@@ -81,10 +81,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint loc;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/sso-uniforms-02.c b/tests/shaders/sso-uniforms-02.c
index 92ce0966..fd49b45b 100644
--- a/tests/shaders/sso-uniforms-02.c
+++ b/tests/shaders/sso-uniforms-02.c
@@ -80,10 +80,7 @@ piglit_init(int argc, char **argv)
 {
 	GLint loc;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/sso-user-varying-01.c b/tests/shaders/sso-user-varying-01.c
index 2cd1695a..b561aaba 100644
--- a/tests/shaders/sso-user-varying-01.c
+++ b/tests/shaders/sso-user-varying-01.c
@@ -86,10 +86,7 @@ piglit_init(int argc, char **argv)
 	GLuint vs;
 	GLuint fs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/sso-user-varying-02.c b/tests/shaders/sso-user-varying-02.c
index dacd14a9..28ec54f3 100644
--- a/tests/shaders/sso-user-varying-02.c
+++ b/tests/shaders/sso-user-varying-02.c
@@ -84,10 +84,7 @@ piglit_init(int argc, char **argv)
 {
 	GLboolean try_to_render;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/trinity-fp1.c b/tests/shaders/trinity-fp1.c
index 52fb4bbd..46bee559 100644
--- a/tests/shaders/trinity-fp1.c
+++ b/tests/shaders/trinity-fp1.c
@@ -229,10 +229,7 @@ piglit_init(int argc, char **argv)
 
 		"END";
 
-	if (piglit_get_gl_version() < 13) {
-		printf("Requires OpenGL 1.3\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(13);
 
 	printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
 
diff --git a/tests/shaders/useprogram-flushverts-1.c b/tests/shaders/useprogram-flushverts-1.c
index 16b79415..8f408969 100644
--- a/tests/shaders/useprogram-flushverts-1.c
+++ b/tests/shaders/useprogram-flushverts-1.c
@@ -113,10 +113,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = vec4(0.0, 0.0, 1.0, 0.0);\n"
 		"}\n";
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_source);
 	fs1 = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs1_source);
diff --git a/tests/shaders/useprogram-flushverts-2.c b/tests/shaders/useprogram-flushverts-2.c
index ef88efe3..fd859e94 100644
--- a/tests/shaders/useprogram-flushverts-2.c
+++ b/tests/shaders/useprogram-flushverts-2.c
@@ -119,10 +119,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = vec4(0.0, 0.0, 1.0, 0.0);\n"
 		"}\n";
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_source);
 	fs1 = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs1_source);
diff --git a/tests/shaders/useprogram-inside-begin.c b/tests/shaders/useprogram-inside-begin.c
index 21d309db..ae8b6d00 100644
--- a/tests/shaders/useprogram-inside-begin.c
+++ b/tests/shaders/useprogram-inside-begin.c
@@ -55,10 +55,7 @@ piglit_init(int argc, char **argv)
 	GLint vs;
 	GLenum err;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_text);
 	fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs_text);
diff --git a/tests/shaders/useprogram-refcount-1.c b/tests/shaders/useprogram-refcount-1.c
index d2f3e980..4ff7db95 100644
--- a/tests/shaders/useprogram-refcount-1.c
+++ b/tests/shaders/useprogram-refcount-1.c
@@ -82,10 +82,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = vec4(0.0, 1.0, 0.0, 0.0);\n"
 		"}\n";
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_source);
 	fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs_source);
diff --git a/tests/shaders/useshaderprogram-bad-program.c b/tests/shaders/useshaderprogram-bad-program.c
index 294357bc..9a90e38a 100644
--- a/tests/shaders/useshaderprogram-bad-program.c
+++ b/tests/shaders/useshaderprogram-bad-program.c
@@ -56,10 +56,7 @@ piglit_init(int argc, char **argv)
 	GLuint prog;
 	GLuint vs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/useshaderprogram-bad-type.c b/tests/shaders/useshaderprogram-bad-type.c
index 226b7a2a..96903039 100644
--- a/tests/shaders/useshaderprogram-bad-type.c
+++ b/tests/shaders/useshaderprogram-bad-type.c
@@ -81,10 +81,7 @@ piglit_init(int argc, char **argv)
 		? 0 : GL_INVALID_ENUM;
 	GLboolean pass;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
diff --git a/tests/shaders/useshaderprogram-flushverts-1.c b/tests/shaders/useshaderprogram-flushverts-1.c
index 61532ef8..e72a1500 100644
--- a/tests/shaders/useshaderprogram-flushverts-1.c
+++ b/tests/shaders/useshaderprogram-flushverts-1.c
@@ -115,10 +115,7 @@ piglit_init(int argc, char **argv)
 		"	gl_FragColor = vec4(0.0, 0.0, 1.0, 0.0);\n"
 		"}\n";
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 	piglit_require_extension("GL_EXT_separate_shader_objects");
 
 	vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_source);
diff --git a/tests/shaders/vp-ignore-input.c b/tests/shaders/vp-ignore-input.c
index 823308be..4d90ec98 100644
--- a/tests/shaders/vp-ignore-input.c
+++ b/tests/shaders/vp-ignore-input.c
@@ -73,10 +73,7 @@ piglit_init(int argc, char **argv)
 
 	glClearColor(0.2, 0.2, 0.2, 1.0);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	compileLinkProg();
 }
diff --git a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
index f3dd62d4..76564f8b 100644
--- a/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
+++ b/tests/spec/arb_copy_buffer/copy_buffer_coherency.c
@@ -71,10 +71,7 @@ do_copy()
 void
 piglit_init(int argc, char *argv[])
 {
-	if (piglit_get_gl_version() < 15) {
-		printf("Requires OpenGL 1.5\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(15);
 
 	piglit_require_extension("GL_ARB_vertex_buffer_object");
 	piglit_require_extension("GL_ARB_copy_buffer");
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c
index e281108d..bb696055 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-fixed-type.c
@@ -83,10 +83,7 @@ piglit_init(int argc, char **argv)
 	GLuint vs, prog;
 	int i,j;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_ES2_compatibility");
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c
index 5767867f..5d8f95db 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-getshaderprecisionformat.c
@@ -71,10 +71,7 @@ piglit_init(int argc, char **argv)
 		{ GL_HIGH_INT,     { 16, 16 },  0 }
 	};
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	if (!piglit_is_extension_supported("GL_ARB_ES2_compatibility")) {
 		printf("Requires ARB_ES2_compatibility\n");
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
index 7c320468..139c9154 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-maxvectors.c
@@ -46,10 +46,7 @@ piglit_init(int argc, char **argv)
 	GLboolean pass = GL_TRUE;
 	GLint floats, vecs;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	if (!piglit_is_extension_supported("GL_ARB_ES2_compatibility")) {
 		printf("Requires ARB_ES2_compatibility\n");
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
index 69fb6917..e8c5bd02 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-releaseshadercompiler.c
@@ -123,10 +123,7 @@ piglit_init(int argc, char **argv)
 		+0.0, -1.0, 0.0, 1.0,
 	};
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	if (!piglit_is_extension_supported("GL_ARB_ES2_compatibility")) {
 		printf("Requires ARB_ES2_compatibility\n");
diff --git a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
index b9fb9898..f0e1dc27 100644
--- a/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
+++ b/tests/spec/arb_es2_compatibility/arb_es2_compatibility-shadercompiler.c
@@ -46,10 +46,7 @@ piglit_init(int argc, char **argv)
 #ifdef GL_ARB_ES2_compatibility
 	GLint shadercompiler;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	if (!piglit_is_extension_supported("GL_ARB_ES2_compatibility")) {
 		printf("Requires ARB_ES2_compatibility\n");
diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c
index 1e6f69b2..f09c4a4a 100644
--- a/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c
+++ b/tests/spec/arb_map_buffer_range/map_buffer_range_error_check.c
@@ -47,10 +47,7 @@ piglit_init(int argc, char *argv[])
 	GLbitfield access = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
 	GLuint buffer;
 
-	if (piglit_get_gl_version() < 15) {
-		printf("Requires OpenGL 1.5\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(15);
 
 	piglit_require_extension("GL_ARB_map_buffer_range");
 
diff --git a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c
index b8a89b0e..d23f556e 100644
--- a/tests/spec/arb_map_buffer_range/map_buffer_range_test.c
+++ b/tests/spec/arb_map_buffer_range/map_buffer_range_test.c
@@ -64,10 +64,7 @@ piglit_init(int argc, char *argv[])
 	int i;
 	bool ret;
 
-	if (piglit_get_gl_version() < 15) {
-		printf("Requires OpenGL 1.5\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(15);
 
 	piglit_require_extension("GL_ARB_map_buffer_range");
 
diff --git a/tests/spec/arb_robustness/draw-vbo-bounds.c b/tests/spec/arb_robustness/draw-vbo-bounds.c
index 8256f4e4..cd5e22f1 100644
--- a/tests/spec/arb_robustness/draw-vbo-bounds.c
+++ b/tests/spec/arb_robustness/draw-vbo-bounds.c
@@ -56,10 +56,7 @@ void piglit_init(int argc, char **argv)
 {
     piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-    if (piglit_get_gl_version() < 15) {
-        printf("Requires OpenGL 1.5\n");
-        piglit_report_result(PIGLIT_SKIP);
-    }
+    piglit_require_gl_version(15);
 
     glShadeModel(GL_FLAT);
     glClearColor(0.2, 0.2, 0.2, 1.0);
diff --git a/tests/spec/arb_timer_query/timestamp-get.c b/tests/spec/arb_timer_query/timestamp-get.c
index 39f1679e..398f64a2 100644
--- a/tests/spec/arb_timer_query/timestamp-get.c
+++ b/tests/spec/arb_timer_query/timestamp-get.c
@@ -134,10 +134,7 @@ piglit_init(int argc, char **argv)
 {
 	piglit_automatic = true;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_ARB_timer_query");
 }
diff --git a/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c b/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c
index 6c4f1161..03236990 100644
--- a/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c
+++ b/tests/spec/arb_vertex_type_2_10_10_10_rev/draw-vertices-2101010.c
@@ -53,10 +53,7 @@ void piglit_init(int argc, char **argv)
 {
     piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-    if (piglit_get_gl_version() < 15) {
-        printf("Requires OpenGL 1.5\n");
-        piglit_report_result(PIGLIT_SKIP);
-    }
+    piglit_require_gl_version(15);
 
     piglit_require_extension("GL_ARB_vertex_type_2_10_10_10_rev");
     glShadeModel(GL_FLAT);
diff --git a/tests/spec/ext_timer_query/time-elapsed.c b/tests/spec/ext_timer_query/time-elapsed.c
index ce27ce0f..c473fe5c 100644
--- a/tests/spec/ext_timer_query/time-elapsed.c
+++ b/tests/spec/ext_timer_query/time-elapsed.c
@@ -265,10 +265,7 @@ retry:
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_EXT_timer_query");
 
diff --git a/tests/spec/gl-2.0/vertex-program-two-side.c b/tests/spec/gl-2.0/vertex-program-two-side.c
index 5014751e..82b96a0a 100644
--- a/tests/spec/gl-2.0/vertex-program-two-side.c
+++ b/tests/spec/gl-2.0/vertex-program-two-side.c
@@ -152,10 +152,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_require_GLSL();
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	printf("Window quadrants show:\n");
 	printf("+-------------------------+------------------------+\n");
diff --git a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c
index 4c87a371..d6896596 100644
--- a/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c
+++ b/tests/spec/gl-3.0/required-renderbuffer-attachment-formats.c
@@ -51,10 +51,7 @@ piglit_init(int argc, char **argv)
 	GLuint rb, fbo;
 	int i;
 
-	if (piglit_get_gl_version() < 30) {
-		printf("Requires GL 3.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(30);
 
 	glGenRenderbuffers(1, &rb);
 	glBindRenderbuffer(GL_RENDERBUFFER, rb);
diff --git a/tests/spec/gl-3.0/required-sized-texture-formats.c b/tests/spec/gl-3.0/required-sized-texture-formats.c
index 21c7849a..20bb2e2e 100644
--- a/tests/spec/gl-3.0/required-sized-texture-formats.c
+++ b/tests/spec/gl-3.0/required-sized-texture-formats.c
@@ -78,10 +78,7 @@ piglit_init(int argc, char **argv)
 	GLuint tex;
 	int i, c;
 
-	if (piglit_get_gl_version() < 30) {
-		printf("Requires GL 3.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(30);
 
 	glGenTextures(1, &tex);
 	glBindTexture(GL_TEXTURE_2D, tex);
diff --git a/tests/spec/gl-3.0/required-texture-attachment-formats.c b/tests/spec/gl-3.0/required-texture-attachment-formats.c
index 1850ab39..8a5fa76a 100644
--- a/tests/spec/gl-3.0/required-texture-attachment-formats.c
+++ b/tests/spec/gl-3.0/required-texture-attachment-formats.c
@@ -51,10 +51,7 @@ piglit_init(int argc, char **argv)
 	GLuint tex, fbo;
 	int i, c;
 
-	if (piglit_get_gl_version() < 30) {
-		printf("Requires GL 3.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(30);
 
 	glGenTextures(1, &tex);
 	glBindTexture(GL_TEXTURE_2D, tex);
diff --git a/tests/spec/nv_conditional_render/begin-while-active.c b/tests/spec/nv_conditional_render/begin-while-active.c
index a1363230..1bd4b792 100644
--- a/tests/spec/nv_conditional_render/begin-while-active.c
+++ b/tests/spec/nv_conditional_render/begin-while-active.c
@@ -56,10 +56,7 @@ piglit_init(int argc, char **argv)
 {
 	GLuint q;
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 
diff --git a/tests/spec/nv_conditional_render/begin-zero.c b/tests/spec/nv_conditional_render/begin-zero.c
index 5a817752..b7aab6fb 100644
--- a/tests/spec/nv_conditional_render/begin-zero.c
+++ b/tests/spec/nv_conditional_render/begin-zero.c
@@ -54,10 +54,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 
diff --git a/tests/spec/nv_conditional_render/bitmap.c b/tests/spec/nv_conditional_render/bitmap.c
index 2e54d7b3..ceda6558 100644
--- a/tests/spec/nv_conditional_render/bitmap.c
+++ b/tests/spec/nv_conditional_render/bitmap.c
@@ -99,10 +99,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 }
diff --git a/tests/spec/nv_conditional_render/blitframebuffer.c b/tests/spec/nv_conditional_render/blitframebuffer.c
index f45e4c16..5b9d487d 100644
--- a/tests/spec/nv_conditional_render/blitframebuffer.c
+++ b/tests/spec/nv_conditional_render/blitframebuffer.c
@@ -131,10 +131,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 	piglit_require_extension("GL_EXT_framebuffer_object");
diff --git a/tests/spec/nv_conditional_render/clear.c b/tests/spec/nv_conditional_render/clear.c
index 1884ad0b..8bc26b96 100644
--- a/tests/spec/nv_conditional_render/clear.c
+++ b/tests/spec/nv_conditional_render/clear.c
@@ -92,10 +92,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 }
diff --git a/tests/spec/nv_conditional_render/copypixels.c b/tests/spec/nv_conditional_render/copypixels.c
index 4ffd8aff..f87e8179 100644
--- a/tests/spec/nv_conditional_render/copypixels.c
+++ b/tests/spec/nv_conditional_render/copypixels.c
@@ -95,10 +95,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 }
diff --git a/tests/spec/nv_conditional_render/copyteximage.c b/tests/spec/nv_conditional_render/copyteximage.c
index e8d1c7cf..8fd7dfa0 100644
--- a/tests/spec/nv_conditional_render/copyteximage.c
+++ b/tests/spec/nv_conditional_render/copyteximage.c
@@ -116,10 +116,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 }
diff --git a/tests/spec/nv_conditional_render/copytexsubimage.c b/tests/spec/nv_conditional_render/copytexsubimage.c
index 675e4fff..1a70b5c7 100644
--- a/tests/spec/nv_conditional_render/copytexsubimage.c
+++ b/tests/spec/nv_conditional_render/copytexsubimage.c
@@ -116,10 +116,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 }
diff --git a/tests/spec/nv_conditional_render/dlist.c b/tests/spec/nv_conditional_render/dlist.c
index e33ea129..75286b5d 100644
--- a/tests/spec/nv_conditional_render/dlist.c
+++ b/tests/spec/nv_conditional_render/dlist.c
@@ -87,10 +87,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 }
diff --git a/tests/spec/nv_conditional_render/drawpixels.c b/tests/spec/nv_conditional_render/drawpixels.c
index 371d8e80..d56b6c83 100644
--- a/tests/spec/nv_conditional_render/drawpixels.c
+++ b/tests/spec/nv_conditional_render/drawpixels.c
@@ -109,10 +109,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 }
diff --git a/tests/spec/nv_conditional_render/generatemipmap.c b/tests/spec/nv_conditional_render/generatemipmap.c
index 90ce8f6d..abc8497c 100644
--- a/tests/spec/nv_conditional_render/generatemipmap.c
+++ b/tests/spec/nv_conditional_render/generatemipmap.c
@@ -115,10 +115,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 	piglit_require_extension("GL_EXT_framebuffer_object");
diff --git a/tests/spec/nv_conditional_render/vertex_array.c b/tests/spec/nv_conditional_render/vertex_array.c
index 25b387f1..b5d97dba 100644
--- a/tests/spec/nv_conditional_render/vertex_array.c
+++ b/tests/spec/nv_conditional_render/vertex_array.c
@@ -92,10 +92,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	piglit_require_extension("GL_NV_conditional_render");
 }
diff --git a/tests/texturing/depth-tex-modes-glsl.c b/tests/texturing/depth-tex-modes-glsl.c
index ba718b46..b1ecc89f 100644
--- a/tests/texturing/depth-tex-modes-glsl.c
+++ b/tests/texturing/depth-tex-modes-glsl.c
@@ -82,10 +82,7 @@ static void loadTex(void);
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	if (piglit_automatic)
 		printf(" Left to Right: LUMINANCE, INTENSITY, ALPHA\n"
diff --git a/tests/texturing/fragment-and-vertex-texturing.c b/tests/texturing/fragment-and-vertex-texturing.c
index 1e98e619..d960c5e8 100644
--- a/tests/texturing/fragment-and-vertex-texturing.c
+++ b/tests/texturing/fragment-and-vertex-texturing.c
@@ -179,10 +179,7 @@ piglit_init(int argc, char **argv)
 
 	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
 
-	if (piglit_get_gl_version() < 20) {
-		printf("Requires OpenGL 2.0\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(20);
 
 	glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, &m);
 	if (m < 1) {
diff --git a/tests/texturing/lodbias.c b/tests/texturing/lodbias.c
index 310f7aa0..bc13e4e0 100644
--- a/tests/texturing/lodbias.c
+++ b/tests/texturing/lodbias.c
@@ -297,10 +297,7 @@ piglit_init(int argc, char **argv)
 {
 	int i;
 
-	if (piglit_get_gl_version() < 13) {
-		printf("Requires OpenGL 1.3\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(13);
 
 	piglit_require_extension("GL_EXT_texture_lod_bias");
 
diff --git a/tests/texturing/tex3d-maxsize.c b/tests/texturing/tex3d-maxsize.c
index 465fffc3..0a8f45b2 100644
--- a/tests/texturing/tex3d-maxsize.c
+++ b/tests/texturing/tex3d-maxsize.c
@@ -188,10 +188,7 @@ piglit_display(void)
 
 void piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 12) {
-		printf("Requires OpenGL 1.2\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(12);
 
 	glDisable(GL_DITHER);
 }
diff --git a/tests/texturing/tex3d.c b/tests/texturing/tex3d.c
index 9e05da9e..49b358a9 100644
--- a/tests/texturing/tex3d.c
+++ b/tests/texturing/tex3d.c
@@ -219,10 +219,7 @@ piglit_display(void)
 void
 piglit_init(int argc, char **argv)
 {
-	if (piglit_get_gl_version() < 12) {
-		printf("Requires OpenGL 1.2\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(12);
 
 	piglit_automatic = GL_TRUE;
 
diff --git a/tests/texturing/texrect-many.c b/tests/texturing/texrect-many.c
index aaff6fbc..b991a204 100644
--- a/tests/texturing/texrect-many.c
+++ b/tests/texturing/texrect-many.c
@@ -103,10 +103,7 @@ void piglit_init(int argc, char **argv)
 	int i;
 	int maxtextures;
 
-	if (piglit_get_gl_version() < 13) {
-		printf("Requires OpenGL 1.3\n");
-		piglit_report_result(PIGLIT_SKIP);
-	}
+	piglit_require_gl_version(13);
 
 	piglit_require_extension("GL_ARB_texture_rectangle");