diff --git a/bsc1222537-py2-email-addr-parse.patch b/bsc1222537-py2-email-addr-parse.patch
index a02130c..3fff5e0 100644
--- a/bsc1222537-py2-email-addr-parse.patch
+++ b/bsc1222537-py2-email-addr-parse.patch
@@ -11,10 +11,10 @@
  
 +    def test_parsing_unicode_str(self):
 +        email_in = "Honza Novák <honza@example.com>"
-+        self.assertEqual(Utils.parseaddr(email_in),
-+                         ('Honza Nov\xc3\xa1k', 'honza@example.com'))
-+        self.assertEqual(Utils.parseaddr(email_in.decode('utf-8')),
-+                         ('Honza Nov\xc3\xa1k', 'honza@example.com'))
++        self.assertEqual(Utils.parseaddr("Honza str Novák <honza@example.com>"),
++                         ('Honza str Nov\xc3\xa1k', 'honza@example.com'))
++        self.assertEqual(Utils.parseaddr(u"Honza unicode Novák <honza@example.com>"),
++                         ('Honza unicode Nov\xe1k', 'honza@example.com'))
 +
      def test_getaddresses_nasty(self):
          for addresses, expected in (
diff --git a/python-base.spec b/python-base.spec
index 144b4ec..a6519e9 100644
--- a/python-base.spec
+++ b/python-base.spec
@@ -383,7 +383,6 @@ LD_LIBRARY_PATH=$PWD:$LD_LIBRARY_PATH \
     make %{?_smp_mflags} $target
 
 %check
-%if %{with test}
 # on hppa, the threading of glibc is quite broken. The tests just stop
 # at some point, and the machine does not build anything more until a
 # timeout several hours later.
@@ -436,7 +435,6 @@ make test TESTOPTS="-l -w -x $EXCLUDE" TESTPYTHONOPTS="-R"
 #make test TESTOPTS="-l -u network -v"
 %endif
 # END OF CHECK SECTION
-%endif
 
 %install
 # replace rest of /usr/local/bin/python or /usr/bin/python2.5 with /usr/bin/python