diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index f8b18b0..7920e23 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -79,6 +79,7 @@ TESTS_progs_M = \
 	kms_atomic \
 	kms_chv_cursor_fail \
 	kms_cursor_crc \
+	kms_dp_aux_dev \
 	kms_draw_crc \
 	kms_fbc_crc \
 	kms_fbcon_fbt \
diff --git a/tests/kms_dp_aux_dev.c b/tests/kms_dp_aux_dev.c
new file mode 100644
index 0000000..088d980
--- /dev/null
+++ b/tests/kms_dp_aux_dev.c
@@ -0,0 +1,190 @@
+/*
+ * Copyright © 2016 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.
+ */
+
+/** @file kms_dp_aux_dev.c
+ *
+ * This is a test of functionality of drm_dp_aux_dev.
+ */
+
+#include "igt.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <drm.h>
+
+#define MAX_CONNECTORS 32
+#define DRM_DP_AUX_SYSFS_PATH "/sys/class/drm_dp_aux_dev"
+
+IGT_TEST_DESCRIPTION("Test of drm_aux_dev nodes.");
+
+static void basic_seek_and_read(int fd)
+{
+	off_t address;
+	uint8_t buf;
+	uint8_t bigbuf[64];
+	ssize_t res;
+
+	/* Basic seek and read */
+	address = lseek(fd, 0x0, SEEK_SET);
+	igt_assert_eq(address, 0x0);
+
+	res = read(fd, &buf, sizeof(buf)); /* read DP version */
+	igt_assert_eq(res, sizeof(buf));
+
+	address = lseek(fd, 0, SEEK_CUR);
+	igt_assert_eq(address, 0x1);
+
+	igt_assert((buf == 0x10) || (buf == 0x11) || (buf == 0x12));
+
+	res = read(fd, &buf, sizeof(buf)); /* read max link rate */
+	igt_assert_eq(res, sizeof(buf));
+
+	address = lseek(fd, 0, SEEK_CUR);
+	igt_assert_eq(address, 0x2);
+
+	igt_assert((buf == 0x06) || (buf == 0x0a) || (buf == 0x14));
+
+	res = read(fd, &buf, sizeof(buf)); /* read max max lane count */
+	igt_assert_eq(res, sizeof(buf));
+
+	address = lseek(fd, 0, SEEK_CUR);
+	igt_assert_eq(address, 0x3);
+
+	buf &= 0xf;
+	igt_assert((buf == 0x1) || (buf == 0x2) || (buf == 0x4));
+
+	/* Test reads on the end of address space */
+	address = lseek(fd, 0, SEEK_END);
+	igt_assert_eq(address, 1 << 20);
+	res = read(fd, &buf, sizeof(buf));
+	igt_assert_eq(res, 0);
+
+	address = lseek(fd, 0, SEEK_CUR);
+	igt_assert_eq(address, 1 << 20);
+
+	address = lseek(fd, 1, SEEK_CUR);
+	igt_assert_eq(address, -1);
+	igt_assert_eq(errno, EINVAL);
+
+	address = lseek(fd, -8, SEEK_END);
+	res = read(fd, bigbuf, sizeof(bigbuf));
+	igt_assert_eq(res, 8);
+
+	address = lseek(fd, 0, SEEK_CUR);
+	igt_assert_eq(address, 1 << 20);
+
+	/* Test reading more than 16 bytes at once */
+	lseek(fd, 0, SEEK_SET);
+	res = read(fd, bigbuf, sizeof(bigbuf));
+	igt_assert_eq(res, sizeof(bigbuf));
+
+	address = lseek(fd, 0, SEEK_CUR);
+	igt_assert_eq(address, 64);
+}
+
+static int count = 0;
+static int fds[MAX_CONNECTORS];
+static bool checked_connections = false;
+static bool connected[MAX_CONNECTORS];
+
+static bool check_aux_connected(int fd)
+{
+	char buf;
+	ssize_t res;
+
+	res = read(fd, &buf, sizeof(buf));
+	igt_assert(res >= 0 || errno == ETIMEDOUT);
+	if (res < 0 && errno == ETIMEDOUT)
+		return false;
+	else
+		return true;
+}
+
+static void for_each_dp_aux(void (*fn)(int))
+{
+	int i;
+	int total = 0;
+
+	for (i = 0; i < count; i++) {
+		igt_assert_fd(fds[i]);
+
+		/* The first time that this loop is executed, check if each aux
+		 * dp is connected and store that result for the next pass
+		 */
+		if (!checked_connections)
+			connected[i] = check_aux_connected(fds[i]);
+
+		if (connected[i]) {
+			fn(fds[i]);
+			total++;
+		}
+	}
+
+	checked_connections = true;
+
+	igt_require(total > 0);
+}
+
+igt_main
+{
+	struct stat st;
+	DIR *dir = NULL;
+
+	igt_fixture {
+		struct dirent *dirent;
+		const char basedir[] = "/dev/";
+		size_t len_base = sizeof(basedir);
+
+		igt_require(stat(DRM_DP_AUX_SYSFS_PATH, &st) == 0);
+		igt_require(S_ISDIR(st.st_mode));
+
+		dir = opendir(DRM_DP_AUX_SYSFS_PATH);
+		igt_require(dir);
+
+		/* store each dp aux dev for later use */
+		while ((dirent = readdir(dir))) {
+			char entry[len_base + NAME_MAX];
+			if (dirent->d_name[0] == '.')
+				continue;
+
+			snprintf(entry, sizeof(entry), "%s%s", basedir, dirent->d_name);
+			fds[count] = open(entry, O_RDONLY);
+			count++;
+		}
+		igt_require(count > 0);
+	}
+
+	igt_subtest("basic_seek_and_read")
+		for_each_dp_aux(basic_seek_and_read);
+
+	igt_fixture {
+		int i;
+		for (i = 0; i < count; i++)
+			close(fds[i]);
+		closedir(dir);
+	}
+}
