diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index ff78ef13..dec45f11 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -429,12 +429,10 @@ uint32_t gem_create(int fd, int size)
  */
 void gem_execbuf(int fd, struct drm_i915_gem_execbuffer2 *execbuf)
 {
-	int ret;
+	int result;
 
-	ret = drmIoctl(fd,
-		       DRM_IOCTL_I915_GEM_EXECBUFFER2,
-		       execbuf);
-	igt_assert(ret == 0);
+	result = drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, execbuf);
+	igt_assert(result == 0);
 	errno = 0;
 }
 
diff --git a/tests/gem_cpu_reloc.c b/tests/gem_cpu_reloc.c
index c67907ad..058089cc 100644
--- a/tests/gem_cpu_reloc.c
+++ b/tests/gem_cpu_reloc.c
@@ -103,7 +103,7 @@ static void copy(int fd, uint32_t batch, uint32_t src, uint32_t dst)
 	execbuf.batch_len = 4096;
 	execbuf.flags = use_blt;
 
-	do_or_die(drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf));
+	gem_execbuf(fd, &execbuf);
 }
 
 static void exec(int fd, uint32_t handle)
@@ -119,7 +119,7 @@ static void exec(int fd, uint32_t handle)
 	execbuf.buffer_count = 1;
 	execbuf.batch_len = 4096;
 
-	do_or_die(drmIoctl(fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf));
+	gem_execbuf(fd, &execbuf);
 }
 
 uint32_t gen6_batch[] = {