diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index bcae7663ae55..912c676c8586 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1046,14 +1046,6 @@ sw/source/filter/ww8/ww8struc.hxx:242
      WW8_BRCVer6::WW8_BRCVer6()
 sw/source/uibase/inc/swcont.hxx:86
     _Bool SwContent::operator==(const class SwContent &) const
-test/inc/unoapi_property_testers.hxx:54
-    void testDoubleReadonlyProperty(class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const double &)
-test/inc/unoapi_property_testers.hxx:74
-    void testLongReadonlyProperty(class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const int &)
-test/inc/unoapi_property_testers.hxx:94
-    void testShortReadonlyProperty(class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const short &)
-test/inc/unoapi_property_testers.hxx:114
-    void testStringReadonlyProperty(class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> &,const class rtl::OUString &,const class rtl::OUString &)
 test/source/sheet/xsubtotalfield.cxx:28
     _Bool CppUnit::assertion_traits::equal(const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &,const class com::sun::star::uno::Sequence<struct com::sun::star::sheet::SubTotalColumn> &)
 test/source/sheet/xsubtotalfield.cxx:34
diff --git a/test/inc/unoapi_property_testers.hxx b/include/test/unoapi_property_testers.hxx
similarity index 100%
rename from test/inc/unoapi_property_testers.hxx
rename to include/test/unoapi_property_testers.hxx
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index e854b0d17551..378720b3f6f9 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,subsequenttest))
 
 $(eval $(call gb_Library_set_include,subsequenttest,\
-    -I$(SRCDIR)/test/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/test/Library_test.mk b/test/Library_test.mk
index 553eb2a3f148..92097613eb4d 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,test))
 
 $(eval $(call gb_Library_set_include,test,\
-    -I$(SRCDIR)/test/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/test/source/sheet/spreadsheet.cxx b/test/source/sheet/spreadsheet.cxx
index f63c3667deee..6ff83c475e46 100644
--- a/test/source/sheet/spreadsheet.cxx
+++ b/test/source/sheet/spreadsheet.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <test/sheet/spreadsheet.hxx>
-#include <unoapi_property_testers.hxx>
+#include <test/unoapi_property_testers.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/test/source/sheet/spreadsheetdocumentsettings.cxx b/test/source/sheet/spreadsheetdocumentsettings.cxx
index cd464b2e15a8..cb68576a34de 100644
--- a/test/source/sheet/spreadsheetdocumentsettings.cxx
+++ b/test/source/sheet/spreadsheetdocumentsettings.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <unoapi_property_testers.hxx>
+#include <test/unoapi_property_testers.hxx>
 #include <test/sheet/spreadsheetdocumentsettings.hxx>
 
 #include <com/sun/star/awt/XDevice.hpp>
diff --git a/test/source/unoapi_property_testers.cxx b/test/source/unoapi_property_testers.cxx
index b54bd396cc30..421079a01093 100644
--- a/test/source/unoapi_property_testers.cxx
+++ b/test/source/unoapi_property_testers.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <unoapi_property_testers.hxx>
+#include <test/unoapi_property_testers.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/Any.hxx>
@@ -15,8 +15,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
+using namespace css;
 
 namespace apitest
 {