diff --git a/coreutils-skip-du-slink-test.patch b/coreutils-skip-du-slink-test.patch
new file mode 100644
index 0000000..e17e128
--- /dev/null
+++ b/coreutils-skip-du-slink-test.patch
@@ -0,0 +1,29 @@
+From: Bernhard Voelker <mail@bernhard-voelker.de>
+Date: Sun, 20 Jan 2013 14:12:00 +0200
+Subject: [PATCH] Skip tests/du/slink on OBS
+
+This test does not work on OBS infrastructure.
+Discussed at:
+http://lists.gnu.org/archive/html/coreutils/2013-01/msg00053.html
+
+The test will be removed upstreams with coreutils-8.21.
+Until then, skip this test.
+
+
+---
+ tests/du/slink |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: coreutils-8.17/tests/du/slink
+===================================================================
+--- coreutils-8.17.orig/tests/du/slink
++++ coreutils-8.17/tests/du/slink
+@@ -19,6 +19,8 @@
+ . "${srcdir=.}/init.sh"; path_prepend_ ../src
+ print_ver_ du
+ 
++skip_ "test does not work on OpenSUSE Build Service infrastructure"
++
+ # Determine if '.' is on a local (would non-NFS be sufficient?) file system.
+ # At least on OSF/1 4.0d, when using an nfsv3 file system,
+ # each created symlink can end up having a size of 0.
diff --git a/coreutils-testsuite.changes b/coreutils-testsuite.changes
index 1d0bb0b..189eb4c 100644
--- a/coreutils-testsuite.changes
+++ b/coreutils-testsuite.changes
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Thu Jan 17 16:41:34 UTC 2013 - mail@bernhard-voelker.de
+Sun Jan 20 13:18:28 UTC 2013 - mail@bernhard-voelker.de
 
 - Avoid segmentation fault in "join -i" with long line input (bnc#798541, VUL-1)
 
@@ -36,6 +36,12 @@ Thu Jan 17 16:41:34 UTC 2013 - mail@bernhard-voelker.de
     This test failed due to heavy parallel CPU and/or disk load because it
     is based on timeouts. Do not run the test-suite with 'make -jN.
     (coreutils.spec, coreutils-testsuite.spec)
+  * tests/du/slink:
+    This test fails on OBS infrastructure and will be removed upstreams
+    in coreutils-8.21 anyway. Skip the test until we upgrade.
+    Upstream discussion:
+    http://lists.gnu.org/archive/html/coreutils/2013-01/msg00053.html
+    (coreutils-skip-du-slink-test.patch)
   * Further spec changes:
     Run more tests: also run "very expensive" tests; add acl, python-pyinotify,
     strace and valgrind to the build requirements.
diff --git a/coreutils-testsuite.spec b/coreutils-testsuite.spec
index 6193f5d..22558ed 100644
--- a/coreutils-testsuite.spec
+++ b/coreutils-testsuite.spec
@@ -87,6 +87,7 @@ Patch37:        coreutils-bnc#697897-setsid.patch
 Patch38:        coreutils-cp-corrupt-fragmented-sparse.patch
 Patch39:        coreutils-no_silent-rule.patch
 Patch40:        coreutils-df-always-hide-rootfs.patch
+Patch41:        coreutils-skip-du-slink-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # this will create a cycle, broken up randomly - coreutils is just too core to have other
 # prerequires
@@ -134,6 +135,7 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
 %patch39
 %endif
 %patch40 -p1
+%patch41 -p1
 
 xz -dc %{S:4} >po/de.po
 
diff --git a/coreutils.changes b/coreutils.changes
index 1d0bb0b..189eb4c 100644
--- a/coreutils.changes
+++ b/coreutils.changes
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Thu Jan 17 16:41:34 UTC 2013 - mail@bernhard-voelker.de
+Sun Jan 20 13:18:28 UTC 2013 - mail@bernhard-voelker.de
 
 - Avoid segmentation fault in "join -i" with long line input (bnc#798541, VUL-1)
 
@@ -36,6 +36,12 @@ Thu Jan 17 16:41:34 UTC 2013 - mail@bernhard-voelker.de
     This test failed due to heavy parallel CPU and/or disk load because it
     is based on timeouts. Do not run the test-suite with 'make -jN.
     (coreutils.spec, coreutils-testsuite.spec)
+  * tests/du/slink:
+    This test fails on OBS infrastructure and will be removed upstreams
+    in coreutils-8.21 anyway. Skip the test until we upgrade.
+    Upstream discussion:
+    http://lists.gnu.org/archive/html/coreutils/2013-01/msg00053.html
+    (coreutils-skip-du-slink-test.patch)
   * Further spec changes:
     Run more tests: also run "very expensive" tests; add acl, python-pyinotify,
     strace and valgrind to the build requirements.
diff --git a/coreutils.spec b/coreutils.spec
index 3de8066..43b755f 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -87,6 +87,7 @@ Patch37:        coreutils-bnc#697897-setsid.patch
 Patch38:        coreutils-cp-corrupt-fragmented-sparse.patch
 Patch39:        coreutils-no_silent-rule.patch
 Patch40:        coreutils-df-always-hide-rootfs.patch
+Patch41:        coreutils-skip-du-slink-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # this will create a cycle, broken up randomly - coreutils is just too core to have other
 # prerequires
@@ -134,6 +135,7 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes
 %patch39
 %endif
 %patch40 -p1
+%patch41 -p1
 
 xz -dc %{S:4} >po/de.po