diff --git a/Makefile b/Makefile
index 4e12dd8c8ec1facc803748d122de600214a63f89..bbde37b5428c5aaf9020c3a47f1d3a2bb80c71b6 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,6 @@ SUBDIRS = \
 	glib/automated/ \
 	gstreamer-buffering/automated/ \
 	gupnp/automated/ \
-	libreoffice/automated/ \
 	librest/automated/ \
 	libsoup/automated/ \
 	networking/proxy-manual/ \
diff --git a/debian/chaiwala-tests.links b/debian/chaiwala-tests.links
index b2ce6e22b6eb539e1082cfd2df4c8bf73487b83a..27ce83753a6c6d6ded61a42d1570cc39a002ec97 100644
--- a/debian/chaiwala-tests.links
+++ b/debian/chaiwala-tests.links
@@ -1,3 +1,4 @@
 usr/lib/apertis-tests/cgroups usr/lib/chaiwala-tests/cgroups
 usr/lib/apertis-tests/dbus/dos-match-rules usr/share/chaiwala-tests/dbus-dos-match-rules/manual
 usr/lib/apertis-tests/dbus/dos-reply-time usr/share/chaiwala-tests/dbus-dos-reply-time/manual
+usr/lib/apertis-tests/libreoffice usr/share/chaiwala-tests/libreoffice
diff --git a/debian/control b/debian/control
index 6350cc9796db2c0d80d3533c8d23bcf1a28e64f3..06ddbee152eed44414827dcf6b3fbe353f47458b 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,10 @@ Depends:
  ${misc:Depends},
  ${python3:Depends},
  ${python:Depends},
+Breaks:
+ chaiwala-tests (<< ${binary:Version}),
+Replaces:
+ chaiwala-tests (<< ${binary:Version}),
 Description: automated and manual test definitions
  This package installs test scripts, test data and other pieces of
  automated and manual tests.
@@ -246,7 +250,6 @@ Depends:
  apparmor (>= 2.8.0-0ubuntu5co7),
  apparmor-profiles,
  chaiwala-apparmor-profiles,
- chaiwala-tests (>= 20130318.0),
  libreoffice-calc,
  libreoffice-impress,
  libreoffice-writer,