diff --git a/docker-rpmlintrc b/docker-rpmlintrc
index 4e49437..62838b9 100644
--- a/docker-rpmlintrc
+++ b/docker-rpmlintrc
@@ -4,5 +4,4 @@ addFilter ("^docker.x86_64: W: statically-linked-binary /usr/lib/docker/dockerin
 addFilter ("^docker.x86_64: W: unstripped-binary-or-object /usr/lib/docker/dockerinit")
 addFilter ("^docker.x86_64: W: no-manual-page-for-binary docker")
 addFilter ("^docker.x86_64: W: no-manual-page-for-binary nsinit")
-addFilter ("^docker-test.noarch: W:.*")
-addFilter ("^docker-test.noarch: E:.*")
+addFilter ("^docker-test.*")
diff --git a/docker.changes b/docker.changes
index fc96b32..52643c6 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Sep  6 13:28:38 UTC 2016 - thipp@suse.de
+
+- update rpmlintrc 
+
+-------------------------------------------------------------------
+Fri Sep  2 12:02:23 UTC 2016 - thipp@suse.de
+
+- make test timeout configurable 
+
 -------------------------------------------------------------------
 Fri Sep  2 10:25:27 UTC 2016 - asarai@suse.com
 
diff --git a/tests.sh b/tests.sh
index e7e2d3c..6e52466 100644
--- a/tests.sh
+++ b/tests.sh
@@ -25,7 +25,9 @@ EXPECTED_CONTAINERD_SOCK=/var/run/docker/libcontainerd/docker-containerd.sock
 CONTAINERD_CTR=/usr/sbin/containerd-ctr
 EXPECTED_CONTAINERD_CTR=/usr/local/bin/docker-containerd-ctr
 
-TEST_ARGS="-check.vv -check.timeout=5m -test.timeout=60m"
+CHECK_TIMEOUT="${CHECK_TIMEOUT:-5m}"
+TEST_TIMEOUT="${TEST_TIMEOUT:-60m}"
+TEST_ARGS="-check.vv -check.timeout=${CHECK_TIMEOUT} -test.timeout=${TEST_TIMEOUT}"
 TEST_SELECT=
 TEST_LOG=/tmp/docker-tests.log
 ENABLE_XUNIT=${ENABLE_XUNIT:-yes}