4 files changed, 8 insertions, 13 deletions
diff --git a/sot/CppunitTest_sot_test_sot.mk b/sot/CppunitTest_sot_test_sot.mk
index d3ac12fb251e..05365287c3ee 100644
--- a/sot/CppunitTest_sot_test_sot.mk
+++ b/sot/CppunitTest_sot_test_sot.mk
@@ -42,9 +42,8 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sot_test_sot, \
     cppuhelper \
     sal \
     sot \
-    test \
     tl \
-    vcl \
+    unotest \
     $(gb_STDLIBS) \
 ))
 
diff --git a/sot/prj/build.lst b/sot/prj/build.lst
index 302881c0f94b..73434fb4dc71 100644
--- a/sot/prj/build.lst
+++ b/sot/prj/build.lst
@@ -1,2 +1,2 @@
-to	sot	:	tools ucbhelper unotools test NULL
+to	sot	:	tools ucbhelper unotools unotest NULL
 to	sot\prj				    nmake	-	all	sot_prj NULL
diff --git a/sot/qa/cppunit/data/pass/fdo41642-2.compound b/sot/qa/cppunit/data/pass/fdo41642-2.compound
new file mode 100644
index 000000000000..b1ae6dd63046
--- /dev/null
+++ b/sot/qa/cppunit/data/pass/fdo41642-2.compound
diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx
index 39d86cb71c9d..b695e8076e65 100644
--- a/sot/qa/cppunit/test_sot.cxx
+++ b/sot/qa/cppunit/test_sot.cxx
@@ -26,7 +26,8 @@
  * instead of those above.
  */
 
-#include <test/filters-test.hxx>
+#include <unotest/filters-test.hxx>
+#include <unotest/bootstrapfixturebase.hxx>
 
 #include <osl/file.hxx>
 #include <osl/process.h>
@@ -36,12 +37,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-    class SotTest : public test::FiltersTest
+    class SotTest
+        : public test::FiltersTest
+        , public test::BootstrapFixtureBase
     {
     public:
-        SotTest() : FiltersTest(false, false) {}
-
-        virtual void setUp();
+        SotTest() {}
 
         virtual bool load(const rtl::OUString &,
             const rtl::OUString &rURL, const rtl::OUString &);
@@ -53,11 +54,6 @@ namespace
         CPPUNIT_TEST_SUITE_END();
     };
 
-    void SotTest::setUp()
-    {
-        test::FiltersTest::setUp();
-    }
-
     bool SotTest::load(const rtl::OUString &,
         const rtl::OUString &rURL, const rtl::OUString &)
     {