diff --git a/diffoscope.changes b/diffoscope.changes
index b6e91a3..744d7b4 100644
--- a/diffoscope.changes
+++ b/diffoscope.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Mar 16 09:20:53 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+
+- add fix-tests-libmix_differences-2.patch to fix a newline in the other upstream patch
+
+-------------------------------------------------------------------
+Mon Mar 15 21:08:35 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+
+- activate test_differences test, as it is fixed in openSUSE TW.
+- use fix-tests-libmix_differences.patch based on upstream patch and activate test_limix_differences tests.
+
+-------------------------------------------------------------------
+Fri Mar 12 08:03:39 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+
+- Disable failing tests explicitly instead of ignoring the exit code.
+
 -------------------------------------------------------------------
 Sat Feb 27 15:00:17 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
 
diff --git a/diffoscope.spec b/diffoscope.spec
index 30ec532..d37b1b9 100644
--- a/diffoscope.spec
+++ b/diffoscope.spec
@@ -26,6 +26,10 @@ URL:            https://diffoscope.org/
 Source0:        https://diffoscope.org/archive/diffoscope-%{version}.tar.bz2
 Source1:        https://diffoscope.org/archive/diffoscope-%{version}.tar.bz2.asc
 Source2:        diffoscope.keyring
+# PATCH-FIX-UPSTREAM fix-tests-libmix_differences.patch -- fixes test_libmix_differences https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/244
+Patch0:         https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/fda75c731cd20383b15bcfc3326100b5ecd0787f.diff#/fix-tests-libmix_differences.patch
+# PATCH-FIX-UPSTREAM fix-tests-libmix_differences-2.patch -- fixes test_libmix_differences https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/244
+Patch1:         https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/27e27436ffad4ef35c2bde751001bef647c12caf.diff#/fix-tests-libmix_differences-2.patch
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-base >= 3.7
@@ -112,6 +116,8 @@ debbindiff.
 %prep
 %setup -q
 sed -i '0,/#!\/usr\/bin\/env/ d' diffoscope/main.py
+%patch0 -p1
+%patch1 -p1
 
 %build
 %python3_build
@@ -134,8 +140,8 @@ if [ "$1" = 0 ] ; then
 fi
 
 %check
-# 3 tests fail 177 skipped due to missing tools, needs more investigation
-py.test-%{python3_bin_suffix} -v || :
+# test_identification https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/98
+py.test-%{python3_bin_suffix} -k 'not test_identification'
 
 %files
 %doc README.rst
diff --git a/fix-tests-libmix_differences-2.patch b/fix-tests-libmix_differences-2.patch
new file mode 100644
index 0000000..04a66cd
--- /dev/null
+++ b/fix-tests-libmix_differences-2.patch
@@ -0,0 +1,9 @@
+diff --git a/tests/data/elfmix_x_obj_objdump_expected_diff b/tests/data/elfmix_x_obj_objdump_expected_diff
+index 1c0aace4c3be236262808f8d87336fcb68c3ec3e..e36b59703d1231667e6609a2f5e4b9264adc09be 100644
+--- a/tests/data/elfmix_x_obj_objdump_expected_diff
++++ b/tests/data/elfmix_x_obj_objdump_expected_diff
+@@ -9,4 +9,3 @@
+ -	movi.n	a2, 42
+ +	movi.n	a2, 43
+  	retw.n
+-
diff --git a/fix-tests-libmix_differences.patch b/fix-tests-libmix_differences.patch
new file mode 100644
index 0000000..bea0da4
--- /dev/null
+++ b/fix-tests-libmix_differences.patch
@@ -0,0 +1,48 @@
+diff --git a/tests/comparators/test_elf.py b/tests/comparators/test_elf.py
+index 5e3658a5afff98f01f23aa0716b49229840890b4..82396313f450676d21bcd774396376435e24f57d 100644
+--- a/tests/comparators/test_elf.py
++++ b/tests/comparators/test_elf.py
+@@ -182,15 +182,22 @@ def test_libmix_differences(libmix_differences):
+     x86_o = x86_o.details[0]
+     assert x86_o.source1.startswith("objdump ")
+     assert src_c.source1.endswith(".c")
+-    x_obj = x_obj.details[0]
+-    assert x_obj.source1.startswith("readelf ")
+ 
+     # Content
+     assert "return42_or_3" in file_list.unified_diff
+     assert_diff(mach_o, "elfmix_mach_o_expected_diff")
+     assert_diff(x86_o, "elfmix_disassembly_expected_diff")
+     assert_diff(src_c, "elfmix_src_c_expected_diff")
+-    assert_diff(x_obj, "elfmix_x_obj_expected_diff")
++
++    x_obj = x_obj.details[0]
++    if x_obj.source1.startswith("readelf "):
++        assert_diff(x_obj, "elfmix_x_obj_expected_diff")
++    elif x_obj.source1.startswith("objdump "):
++        assert_diff(x_obj, "elfmix_x_obj_objdump_expected_diff")
++    else:
++        pytest.fail(
++            f"x_obj is neither readelf or objdump: {repr(x_obj.source1)}"
++        )
+ 
+ 
+ TEST_DBGSYM_DEB1_PATH = data("dbgsym/add/test-dbgsym_1_amd64.deb")
+diff --git a/tests/data/elfmix_x_obj_objdump_expected_diff b/tests/data/elfmix_x_obj_objdump_expected_diff
+new file mode 100644
+index 0000000000000000000000000000000000000000..1c0aace4c3be236262808f8d87336fcb68c3ec3e
+--- /dev/null
++++ b/tests/data/elfmix_x_obj_objdump_expected_diff
+@@ -0,0 +1,12 @@
++@@ -3,9 +3,9 @@
++ 
++ Disassembly of section .text:
++ 
++ 00000000 <return42_or_3>:
++ return42_or_3():
++ 	entry	a1, 32
++ 	mov.n	a7, a1
++-	movi.n	a2, 42
+++	movi.n	a2, 43
++ 	retw.n
++