3 files changed, 41 insertions, 2 deletions
diff --git a/sw/PythonTest_sw_unoapi.mk b/sw/PythonTest_sw_unoapi.mk
index de486effec9a..afaf86d0b48d 100644
--- a/sw/PythonTest_sw_unoapi.mk
+++ b/sw/PythonTest_sw_unoapi.mk
@@ -9,6 +9,45 @@
 
 $(eval $(call gb_PythonTest_PythonTest,sw_unoapi))
 
+$(eval $(call gb_PythonTest_use_configuration,sw_unoapi))
+
+$(eval $(call gb_PythonTest_use_api,sw_unoapi,offapi))
+
+# FAIL: this brings in GconfBackend $(eval $(call gb_PythonTest_use_rdb,sw_unoapi,services))
+
+$(eval $(call gb_PythonTest_use_components,sw_unoapi,\
+    basic/util/sb \
+    comphelper/util/comphelp \
+    configmgr/source/configmgr \
+    dbaccess/util/dba \
+    fileaccess/source/fileacc \
+    filter/source/config/cache/filterconfig1 \
+    forms/util/frm \
+    framework/util/fwk \
+    i18npool/util/i18npool \
+    oox/util/oox \
+    package/source/xstor/xstor \
+    package/util/package2 \
+    sax/source/expatwrap/expwrap \
+    sax/source/fastparser/fastsax \
+    sw/util/sw \
+    sw/util/swd \
+    sw/util/msword \
+    sw/util/vbaswobj \
+    scripting/source/basprov/basprov \
+    scripting/util/scriptframe \
+    sfx2/util/sfx \
+    sot/util/sot \
+    svl/source/fsstor/fsstorage \
+    toolkit/util/tk \
+    ucb/source/core/ucb1 \
+    ucb/source/ucp/file/ucpfile1 \
+    ucb/source/ucp/tdoc/ucptdoc1 \
+    unotools/util/utl \
+    unoxml/source/rdf/unordf \
+    unoxml/source/service/unoxml \
+))
+
 $(eval $(call gb_PythonTest_add_classes,sw_unoapi,\
     $(SRCDIR)/sw/qa/unoapi/python/set_expression.py \
     $(SRCDIR)/sw/qa/unoapi/python/get_expression.py \
diff --git a/sw/qa/unoapi/python/get_expression.py b/sw/qa/unoapi/python/get_expression.py
index 277d3cfa5ba9..5ac49f88fc34 100644
--- a/sw/qa/unoapi/python/get_expression.py
+++ b/sw/qa/unoapi/python/get_expression.py
@@ -1,5 +1,5 @@
 import unittest
-from org.libreoffice.unotest import UnoConnection
+from org.libreoffice.unotest import UnoNotConnection as UnoConnection
 
 class TestGetExpression(unittest.TestCase):
     _unoCon = None
diff --git a/sw/qa/unoapi/python/set_expression.py b/sw/qa/unoapi/python/set_expression.py
index 8f6d19e26396..d88d2f384ef0 100644
--- a/sw/qa/unoapi/python/set_expression.py
+++ b/sw/qa/unoapi/python/set_expression.py
@@ -1,5 +1,5 @@
 import unittest
-from org.libreoffice.unotest import UnoConnection
+from org.libreoffice.unotest import UnoNotConnection as UnoConnection
 
 #@unittest.skip("that seems to work")
 class TestSetExpresion(unittest.TestCase):