diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 0eb9369c..698e290e 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -66,6 +66,7 @@ TESTS_progs_M = \
 	kms_cursor_crc \
 	kms_fbc_crc \
 	kms_flip \
+	kms_flip_event_leak \
 	kms_flip_tiling \
 	kms_mmio_vs_cs_flip \
 	kms_pipe_crc_basic \
diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
new file mode 100644
index 00000000..99243335
--- /dev/null
+++ b/tests/kms_flip_event_leak.c
@@ -0,0 +1,132 @@
+/*
+ * Copyright © 2014 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.
+ *
+ */
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "drmtest.h"
+#include "igt_debugfs.h"
+#include "igt_kms.h"
+#include "intel_chipset.h"
+#include "intel_batchbuffer.h"
+#include "ioctl_wrappers.h"
+
+typedef struct {
+	int drm_fd;
+	igt_display_t display;
+} data_t;
+
+/*
+ * This test tries to provoke the kernel to leak a pending page flip event
+ * when the fd is closed before the flip has completed. The test itself won't
+ * fail even if the kernel leaks the event, but the resulting dmesg WARN
+ * will cause piglit to report a failure.
+ */
+static bool test(data_t *data, enum pipe pipe, igt_output_t *output)
+{
+	igt_plane_t *primary;
+	drmModeModeInfo *mode;
+	struct igt_fb fb[2];
+	int fd, ret;
+
+	/* select the pipe we want to use */
+	igt_output_set_pipe(output, pipe);
+	igt_display_commit(&data->display);
+
+	if (!output->valid) {
+		igt_output_set_pipe(output, PIPE_ANY);
+		igt_display_commit(&data->display);
+		return false;
+	}
+
+	primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
+	mode = igt_output_get_mode(output);
+
+	igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
+			    DRM_FORMAT_XRGB8888,
+			    true, /* tiled */
+			    0.0, 0.0, 0.0, &fb[0]);
+
+	igt_plane_set_fb(primary, &fb[0]);
+	igt_display_commit2(&data->display, COMMIT_LEGACY);
+
+	fd = drm_open_any();
+
+	ret = drmDropMaster(data->drm_fd);
+	igt_assert(ret == 0);
+
+	ret = drmSetMaster(fd);
+	igt_assert(ret == 0);
+
+	igt_create_color_fb(fd, mode->hdisplay, mode->vdisplay,
+			    DRM_FORMAT_XRGB8888,
+			    true, /* tiled */
+			    0.0, 0.0, 0.0, &fb[1]);
+	ret = drmModePageFlip(fd, output->config.crtc->crtc_id,
+			      fb[1].fb_id, DRM_MODE_PAGE_FLIP_EVENT,
+			      data);
+	igt_assert(ret == 0);
+
+	ret = close(fd);
+	igt_assert(ret == 0);
+
+	ret = drmSetMaster(data->drm_fd);
+	igt_assert(ret == 0);
+
+	igt_plane_set_fb(primary, NULL);
+	igt_output_set_pipe(output, PIPE_ANY);
+	igt_display_commit(&data->display);
+
+	igt_remove_fb(data->drm_fd, &fb[0]);
+
+	return true;
+}
+
+igt_simple_main
+{
+	data_t data = {};
+	igt_output_t *output;
+	int valid_tests = 0;
+	enum pipe pipe;
+
+	igt_skip_on_simulation();
+
+	data.drm_fd = drm_open_any();
+	igt_set_vt_graphics_mode();
+
+	igt_display_init(&data.display, data.drm_fd);
+
+	for (pipe = 0; pipe < 3; pipe++) {
+		for_each_connected_output(&data.display, output) {
+			if (test(&data, pipe, output))
+				valid_tests++;
+		}
+	}
+
+	igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
+
+	igt_display_fini(&data.display);
+}