diff --git a/5e397d9c-test-fix-dbus-crash.patch b/5e397d9c-test-fix-dbus-crash.patch
new file mode 100644
index 0000000..9cd8009
--- /dev/null
+++ b/5e397d9c-test-fix-dbus-crash.patch
@@ -0,0 +1,31 @@
+From 5e397d9c0f2ce7d464f8e7e6a598d1c955dfc04a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
+Date: Wed, 18 Dec 2013 17:33:44 +0000
+Subject: [PATCH] Fix crash in virsystemdtest with dbus 1.7.6
+
+D-bus introduced some changes in its locking code. Overriding the init
+function skips the new locking init and thus crashes later in libvirt
+test. Removing the function makes the test pass again.
+---
+ tests/virsystemdmock.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c
+index b8fc031..b3b82b4 100644
+--- a/tests/virsystemdmock.c
++++ b/tests/virsystemdmock.c
+@@ -31,11 +31,6 @@ void dbus_connection_set_change_sigpipe(dbus_bool_t will_modify_sigpipe ATTRIBUT
+ {
+ }
+ 
+-dbus_bool_t dbus_threads_init_default(void)
+-{
+-    return 1;
+-}
+-
+ DBusConnection *dbus_bus_get(DBusBusType type ATTRIBUTE_UNUSED,
+                              DBusError *error ATTRIBUTE_UNUSED)
+ {
+-- 
+1.8.4.4
+
diff --git a/78af457e-fix-virnettlscontexttest.patch b/78af457e-fix-virnettlscontexttest.patch
new file mode 100644
index 0000000..f06f8d2
--- /dev/null
+++ b/78af457e-fix-virnettlscontexttest.patch
@@ -0,0 +1,43 @@
+From 78af457eefaf40e66a28b00446c03f8ee9a7f30f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
+Date: Mon, 23 Dec 2013 09:01:42 +0100
+Subject: [PATCH] virnettlscontexttest fails with GNUTLS 3.0.28
+
+On openSUSE 12.x with GNUTLS 3.0.28, virnettlscontexttest fails. It has
+been reported to work from GNUTLS 3.1.11 on Fedora 19. Changed the
+constraints on gnutls to 3.1+ for unit test cacert4req.
+
+Signed-off-by: Eric Blake <eblake@redhat.com>
+---
+ tests/virnettlscontexttest.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
+index fc512fc..1cc9946 100644
+--- a/tests/virnettlscontexttest.c
++++ b/tests/virnettlscontexttest.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2011-2012 Red Hat, Inc.
++ * Copyright (C) 2011-2013 Red Hat, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -265,10 +265,12 @@ mymain(void)
+ 
+     /* Technically a CA cert with basic constraints
+      * key purpose == key signing + non-critical should
+-     * be rejected. GNUTLS < 3 does not reject it and
++     * be rejected. GNUTLS < 3.1 does not reject it and
+      * we don't anticipate them changing this behaviour
+      */
+-    DO_CTX_TEST(true, cacert4req.filename, servercert4req.filename, GNUTLS_VERSION_MAJOR >= 3);
++    DO_CTX_TEST(true, cacert4req.filename, servercert4req.filename,
++                (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR >= 1) ||
++                GNUTLS_VERSION_MAJOR > 3);
+     DO_CTX_TEST(true, cacert5req.filename, servercert5req.filename, true);
+     DO_CTX_TEST(true, cacert6req.filename, servercert6req.filename, true);
+ 
+-- 
+1.8.4.4
+
diff --git a/libvirt.changes b/libvirt.changes
index ed25abd..1494478 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 26 12:16:13 UTC 2013 - cbosdonnat@suse.com
+
+- Fixed and reenabled unit tests. bnc#854694
+
 -------------------------------------------------------------------
 Fri Dec 20 13:13:03 MST 2013 - jfehlig@suse.com
 
diff --git a/libvirt.spec b/libvirt.spec
index e9d7ede..ea3dd35 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -420,6 +420,8 @@ Source99:       baselibs.conf
 # Upstream patches
 Patch0:         f8c1cb90-CVE-2013-6436.patch
 Patch1:         9faf3f29-LXC-memtune.patch
+Patch2:         5e397d9c-test-fix-dbus-crash.patch
+Patch3:         78af457e-fix-virnettlscontexttest.patch
 # Need to go upstream
 Patch100:       xen-name-for-devid.patch
 Patch101:       ia64-clone.patch
@@ -919,6 +921,8 @@ namespaces.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -1261,6 +1265,23 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirt-guests $RPM_BUILD_ROOT%{_loca
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+cd tests
+make
+# These tests don't current work in a mock build root
+for i in nodeinfotest seclabeltest
+do
+  rm -f $i
+  printf 'int main(void) { return 0; }' > $i.c
+  printf '#!/bin/sh\nexit 0\n' > $i
+  chmod +x $i
+done
+if ! make check VIR_TEST_DEBUG=1
+then
+  cat test-suite.log || true
+  exit 1
+fi
+
 %if %{with_libvirtd}
 
 %pre daemon