diff --git a/.gitignore b/.gitignore
index 3596a4a8e4b9..06cc9283b494 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,10 +79,6 @@ tests/getclient
 tests/getstats
 tests/getversion
 tests/lock
-tests/gem_basic
-tests/gem_flink
-tests/gem_mmap
-tests/gem_readwrite
 tests/openclose
 tests/setversion
 tests/updatedraw
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e7ec4fa5ecff..37b8d3a1a271 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -58,15 +58,6 @@ TESTS =						\
 
 SUBDIRS += vbltest $(NULL)
 
-if HAVE_INTEL
-TESTS +=					\
-	gem_basic				\
-	gem_flink				\
-	gem_readwrite				\
-	gem_mmap				\
-	$(NULL)
-endif
-
 check_PROGRAMS += $(TESTS)
 
 endif
diff --git a/tests/gem_basic.c b/tests/gem_basic.c
deleted file mode 100644
index 4e4b6cbdf1a9..000000000000
--- a/tests/gem_basic.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright © 2008 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include "drm.h"
-#include "i915_drm.h"
-
-static void
-test_bad_close(int fd)
-{
-	struct drm_gem_close close;
-	int ret;
-
-	printf("Testing error return on bad close ioctl.\n");
-
-	close.handle = 0x10101010;
-	ret = ioctl(fd, DRM_IOCTL_GEM_CLOSE, &close);
-
-	assert(ret == -1 && errno == EINVAL);
-}
-
-static void
-test_create_close(int fd)
-{
-	struct drm_i915_gem_create create;
-	struct drm_gem_close close;
-	int ret;
-
-	printf("Testing creating and closing an object.\n");
-
-	memset(&create, 0, sizeof(create));
-	create.size = 16 * 1024;
-	ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
-	assert(ret == 0);
-
-	close.handle = create.handle;
-	ret = ioctl(fd, DRM_IOCTL_GEM_CLOSE, &close);
-}
-
-static void
-test_create_fd_close(int fd)
-{
-	struct drm_i915_gem_create create;
-	int ret;
-
-	printf("Testing closing with an object allocated.\n");
-
-	memset(&create, 0, sizeof(create));
-	create.size = 16 * 1024;
-	ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
-	assert(ret == 0);
-
-	close(fd);
-}
-
-int main(int argc, char **argv)
-{
-	int fd;
-
-	fd = drm_open_matching("8086:*", 0);
-	if (fd < 0) {
-		fprintf(stderr, "failed to open intel drm device\n");
-		return 0;
-	}
-
-	test_bad_close(fd);
-	test_create_close(fd);
-	test_create_fd_close(fd);
-
-	return 0;
-}
diff --git a/tests/gem_flink.c b/tests/gem_flink.c
deleted file mode 100644
index ce43e42201ac..000000000000
--- a/tests/gem_flink.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright © 2008 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include "drm.h"
-#include "i915_drm.h"
-
-static void
-test_flink(int fd)
-{
-	struct drm_i915_gem_create create;
-	struct drm_gem_flink flink;
-	struct drm_gem_open open;
-	int ret;
-
-	printf("Testing flink and open.\n");
-
-	memset(&create, 0, sizeof(create));
-	create.size = 16 * 1024;
-	ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
-	assert(ret == 0);
-
-	flink.handle = create.handle;
-	ret = ioctl(fd, DRM_IOCTL_GEM_FLINK, &flink);
-	assert(ret == 0);
-
-	open.name = flink.name;
-	ret = ioctl(fd, DRM_IOCTL_GEM_OPEN, &open);
-	assert(ret == 0);
-	assert(open.handle != 0);
-}
-
-static void
-test_double_flink(int fd)
-{
-	struct drm_i915_gem_create create;
-	struct drm_gem_flink flink;
-	struct drm_gem_flink flink2;
-	int ret;
-
-	printf("Testing repeated flink.\n");
-
-	memset(&create, 0, sizeof(create));
-	create.size = 16 * 1024;
-	ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
-	assert(ret == 0);
-
-	flink.handle = create.handle;
-	ret = ioctl(fd, DRM_IOCTL_GEM_FLINK, &flink);
-	assert(ret == 0);
-
-	flink2.handle = create.handle;
-	ret = ioctl(fd, DRM_IOCTL_GEM_FLINK, &flink2);
-	assert(ret == 0);
-	assert(flink2.name == flink.name);
-}
-
-static void
-test_bad_flink(int fd)
-{
-	struct drm_gem_flink flink;
-	int ret;
-
-	printf("Testing error return on bad flink ioctl.\n");
-
-	flink.handle = 0x10101010;
-	ret = ioctl(fd, DRM_IOCTL_GEM_FLINK, &flink);
-	assert(ret == -1 && errno == ENOENT);
-}
-
-static void
-test_bad_open(int fd)
-{
-	struct drm_gem_open open;
-	int ret;
-
-	printf("Testing error return on bad open ioctl.\n");
-
-	open.name = 0x10101010;
-	ret = ioctl(fd, DRM_IOCTL_GEM_OPEN, &open);
-
-	assert(ret == -1 && errno == ENOENT);
-}
-
-int main(int argc, char **argv)
-{
-	int fd;
-
-	if (geteuid()) {
-		fprintf(stderr, "requires root privileges, skipping\n");
-		return 77;
-	}
-
-	fd = drm_open_matching("8086:*", 0);
-	if (fd < 0) {
-		fprintf(stderr, "failed to open intel drm device, skipping\n");
-		return 77;
-	}
-
-	test_flink(fd);
-	test_double_flink(fd);
-	test_bad_flink(fd);
-	test_bad_open(fd);
-
-	return 0;
-}
diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c
deleted file mode 100644
index 2239789fade0..000000000000
--- a/tests/gem_mmap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright © 2008 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include "drm.h"
-#include "i915_drm.h"
-
-#define OBJECT_SIZE 16384
-
-int do_read(int fd, int handle, void *buf, int offset, int size)
-{
-	struct drm_i915_gem_pread read;
-
-	/* Ensure that we don't have any convenient data in buf in case
-	 * we fail.
-	 */
-	memset(buf, 0xd0, size);
-
-	memset(&read, 0, sizeof(read));
-	read.handle = handle;
-	read.data_ptr = (uintptr_t)buf;
-	read.size = size;
-	read.offset = offset;
-
-	return ioctl(fd, DRM_IOCTL_I915_GEM_PREAD, &read);
-}
-
-int do_write(int fd, int handle, void *buf, int offset, int size)
-{
-	struct drm_i915_gem_pwrite write;
-
-	memset(&write, 0, sizeof(write));
-	write.handle = handle;
-	write.data_ptr = (uintptr_t)buf;
-	write.size = size;
-	write.offset = offset;
-
-	return ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &write);
-}
-
-int main(int argc, char **argv)
-{
-	int fd;
-	struct drm_i915_gem_create create;
-	struct drm_i915_gem_mmap mmap;
-	struct drm_gem_close unref;
-	uint8_t expected[OBJECT_SIZE];
-	uint8_t buf[OBJECT_SIZE];
-	uint8_t *addr;
-	int ret;
-	int handle;
-
-	fd = drm_open_matching("8086:*", 0);
-	if (fd < 0) {
-		fprintf(stderr, "failed to open intel drm device, skipping\n");
-		return 0;
-	}
-
-	memset(&mmap, 0, sizeof(mmap));
-	mmap.handle = 0x10101010;
-	mmap.offset = 0;
-	mmap.size = 4096;
-	printf("Testing mmaping of bad object.\n");
-	ret = ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &mmap);
-	assert(ret == -1 && errno == ENOENT);
-
-	memset(&create, 0, sizeof(create));
-	create.size = OBJECT_SIZE;
-	ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
-	assert(ret == 0);
-	handle = create.handle;
-
-	printf("Testing mmaping of newly created object.\n");
-	mmap.handle = handle;
-	mmap.offset = 0;
-	mmap.size = OBJECT_SIZE;
-	ret = ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &mmap);
-	assert(ret == 0);
-	addr = (uint8_t *)(uintptr_t)mmap.addr_ptr;
-
-	printf("Testing contents of newly created object.\n");
-	memset(expected, 0, sizeof(expected));
-	assert(memcmp(addr, expected, sizeof(expected)) == 0);
-
-	printf("Testing coherency of writes and mmap reads.\n");
-	memset(buf, 0, sizeof(buf));
-	memset(buf + 1024, 0x01, 1024);
-	memset(expected + 1024, 0x01, 1024);
-	ret = do_write(fd, handle, buf, 0, OBJECT_SIZE);
-	assert(ret == 0);
-	assert(memcmp(buf, addr, sizeof(buf)) == 0);
-
-	printf("Testing that mapping stays after close\n");
-	unref.handle = handle;
-	ret = ioctl(fd, DRM_IOCTL_GEM_CLOSE, &unref);
-	assert(ret == 0);
-	assert(memcmp(buf, addr, sizeof(buf)) == 0);
-
-	printf("Testing unmapping\n");
-	munmap(addr, OBJECT_SIZE);
-
-	close(fd);
-
-	return 0;
-}
diff --git a/tests/gem_readwrite.c b/tests/gem_readwrite.c
deleted file mode 100644
index 07dc853a0c24..000000000000
--- a/tests/gem_readwrite.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright © 2008 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include "drm.h"
-#include "i915_drm.h"
-
-#define OBJECT_SIZE 16384
-
-int do_read(int fd, int handle, void *buf, int offset, int size)
-{
-	struct drm_i915_gem_pread read;
-
-	/* Ensure that we don't have any convenient data in buf in case
-	 * we fail.
-	 */
-	memset(buf, 0xd0, size);
-
-	memset(&read, 0, sizeof(read));
-	read.handle = handle;
-	read.data_ptr = (uintptr_t)buf;
-	read.size = size;
-	read.offset = offset;
-
-	return ioctl(fd, DRM_IOCTL_I915_GEM_PREAD, &read);
-}
-
-int do_write(int fd, int handle, void *buf, int offset, int size)
-{
-	struct drm_i915_gem_pwrite write;
-
-	memset(&write, 0, sizeof(write));
-	write.handle = handle;
-	write.data_ptr = (uintptr_t)buf;
-	write.size = size;
-	write.offset = offset;
-
-	return ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &write);
-}
-
-int main(int argc, char **argv)
-{
-	int fd;
-	struct drm_i915_gem_create create;
-	uint8_t expected[OBJECT_SIZE];
-	uint8_t buf[OBJECT_SIZE];
-	int ret;
-	int handle;
-
-	fd = drm_open_matching("8086:*", 0);
-	if (fd < 0) {
-		fprintf(stderr, "failed to open intel drm device, skipping\n");
-		return 0;
-	}
-
-	memset(&create, 0, sizeof(create));
-	create.size = OBJECT_SIZE;
-	ret = ioctl(fd, DRM_IOCTL_I915_GEM_CREATE, &create);
-	assert(ret == 0);
-	handle = create.handle;
-
-	printf("Testing contents of newly created object.\n");
-	ret = do_read(fd, handle, buf, 0, OBJECT_SIZE);
-	assert(ret == 0);
-	memset(&expected, 0, sizeof(expected));
-	assert(memcmp(expected, buf, sizeof(expected)) == 0);
-
-	printf("Testing read beyond end of buffer.\n");
-	ret = do_read(fd, handle, buf, OBJECT_SIZE / 2, OBJECT_SIZE);
-	printf("%d %d\n", ret, errno);
-	assert(ret == -1 && errno == EINVAL);
-
-	printf("Testing full write of buffer\n");
-	memset(buf, 0, sizeof(buf));
-	memset(buf + 1024, 0x01, 1024);
-	memset(expected + 1024, 0x01, 1024);
-	ret = do_write(fd, handle, buf, 0, OBJECT_SIZE);
-	assert(ret == 0);
-	ret = do_read(fd, handle, buf, 0, OBJECT_SIZE);
-	assert(ret == 0);
-	assert(memcmp(buf, expected, sizeof(buf)) == 0);
-
-	printf("Testing partial write of buffer\n");
-	memset(buf + 4096, 0x02, 1024);
-	memset(expected + 4096, 0x02, 1024);
-	ret = do_write(fd, handle, buf + 4096, 4096, 1024);
-	assert(ret == 0);
-	ret = do_read(fd, handle, buf, 0, OBJECT_SIZE);
-	assert(ret == 0);
-	assert(memcmp(buf, expected, sizeof(buf)) == 0);
-
-	printf("Testing partial read of buffer\n");
-	ret = do_read(fd, handle, buf, 512, 1024);
-	assert(ret == 0);
-	assert(memcmp(buf, expected + 512, 1024) == 0);
-
-	printf("Testing read of bad buffer handle\n");
-	ret = do_read(fd, 1234, buf, 0, 1024);
-	assert(ret == -1 && errno == ENOENT);
-
-	printf("Testing write of bad buffer handle\n");
-	ret = do_write(fd, 1234, buf, 0, 1024);
-	assert(ret == -1 && errno == ENOENT);
-
-	close(fd);
-
-	return 0;
-}
