diff --git a/meson-handle-skipped-tests.patch b/meson-handle-skipped-tests.patch
new file mode 100644
index 0000000..3f8097a
--- /dev/null
+++ b/meson-handle-skipped-tests.patch
@@ -0,0 +1,24 @@
+From d3e0a58260226286c067a7c39f39b704f124813a Mon Sep 17 00:00:00 2001
+From: Jussi Pakkanen <jpakkane@gmail.com>
+Date: Wed, 17 May 2017 23:11:52 +0300
+Subject: [PATCH] Skip unittests that request it rather than mark them as
+ failed. Closes #1804.
+
+---
+ run_unittests.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/run_unittests.py b/run_unittests.py
+index ec9d53b..2ef1be6 100755
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -381,6 +381,8 @@ def _run(self, command, workdir=None):
+         output = p.communicate()[0]
+         print(output)
+         if p.returncode != 0:
++            if 'MESON_SKIP_TEST' in output:
++                raise unittest.SkipTest('Project requested skipping.')
+             raise subprocess.CalledProcessError(p.returncode, command)
+         return output
+ 
+
diff --git a/meson.changes b/meson.changes
index 63ee47d..0200b1d 100644
--- a/meson.changes
+++ b/meson.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 17 20:26:25 UTC 2017 - dimstar@opensuse.org
+
+- Add meson-handle-skipped-tests.patch: Actually do skip tests that
+  are marked as MESON_SKIP_TEST (gh#mesonbuild/meson#1804).
+
 -------------------------------------------------------------------
 Mon May  8 07:53:20 UTC 2017 - dimstar@opensuse.org
 
diff --git a/meson.spec b/meson.spec
index af89255..d2acf49 100644
--- a/meson.spec
+++ b/meson.spec
@@ -33,6 +33,8 @@ Patch0:         meson-suse-ify-macros.patch
 Patch1:         meson-fix-gcc48.patch
 # PATCH-FIX-UPSTREAM meson-disable-untested-code.patch gh#mesonbuild/meson#1480 dimstar@opensuse.org -- Do not assume that the untested meson test works with glib 2.52.0
 Patch2:         meson-disable-untested-code.patch
+# PATCH-FIX-UPSTREAM meson-handle-skipped-tests.patch gh#mesonbuild/meson#1804 dimstar@opensuse.org -- Actually do skip tests that are marked as MESON_SKIP_TEST
+Patch3:         meson-handle-skipped-tests.patch
 BuildRequires:  bison
 BuildRequires:  boost-devel
 BuildRequires:  flex
@@ -80,6 +82,7 @@ Domain Specific Language.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Lack of gtest, gmock, gnustep.
 rm -rf "test cases/frameworks/2 gtest" \