diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 5a88f18..7c750f8 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Module_add_check_targets,chart2,\
 ))
 
 $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
-    CppunitTest_chart2_export \
     CppunitTest_chart2_import \
     CppunitTest_chart2_trendcalculators \
 ))
diff --git a/lotuswordpro/Module_lotuswordpro.mk b/lotuswordpro/Module_lotuswordpro.mk
index 538702e..1d8a7d2 100644
--- a/lotuswordpro/Module_lotuswordpro.mk
+++ b/lotuswordpro/Module_lotuswordpro.mk
@@ -15,9 +15,6 @@ $(eval $(call gb_Module_add_targets,lotuswordpro,\
     Library_lwpft \
 ))
 
-$(eval $(call gb_Module_add_check_targets,lotuswordpro,\
-    CppunitTest_lotuswordpro_test_lotuswordpro \
-))
 
 endif
 
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 55e4291..9a3e625 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -919,7 +919,7 @@ Reference< XShape > const & Shape::createAndInsert(
             }
             else if (mbTextBox)
             {
-                aShapeProps.setProperty(PROP_TextBox, uno::makeAny(true));
+            //    aShapeProps.setProperty(PROP_TextBox, uno::makeAny(true));
             }
 
             if (aServiceName != "com.sun.star.text.TextFrame" && isLinkedTxbx())
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index eb67f30..7e80827 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -190,7 +190,8 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
     case XML_txbx:
     {
         mpShape->getCustomShapeProperties()->setShapeTypeOverride(true);
-        mpShape->setTextBox(true);
+       mpShape->setServiceName("com.sun.star.text.TextFrame");
+       mpShape->setTextBox(true);
         //in case if the textbox is linked, save the attributes
         //for further processing.
         if (rAttribs.hasAttribute(XML_id))
@@ -211,6 +212,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
         //in case if the textbox is linked, save the attributes
         //for further processing.
         mpShape->getCustomShapeProperties()->setShapeTypeOverride(true);
+        mpShape->setServiceName("com.sun.star.text.TextFrame");
         mpShape->setTextBox(true);
         OptValue<OUString> id  = rAttribs.getString(XML_id);
         OptValue<OUString> seq = rAttribs.getString(XML_seq);
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 39b466f..70e7893 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -52,23 +52,13 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
     CppunitTest_sw_htmlexport \
     CppunitTest_sw_htmlimport \
     CppunitTest_sw_macros_test \
-    CppunitTest_sw_ooxmlexport \
-    CppunitTest_sw_ooxmlexport2 \
-    CppunitTest_sw_ooxmlexport3 \
-    CppunitTest_sw_ooxmlexport4 \
-    CppunitTest_sw_ooxmlexport5 \
-    CppunitTest_sw_ooxmlexport6 \
-    CppunitTest_sw_ooxmlexport7 \
     CppunitTest_sw_ooxmlfieldexport \
     CppunitTest_sw_ooxmlw14export \
-    CppunitTest_sw_ooxmlimport \
     CppunitTest_sw_ww8export \
-    CppunitTest_sw_ww8import \
     CppunitTest_sw_rtfexport \
     CppunitTest_sw_rtfimport \
     CppunitTest_sw_odfexport \
     CppunitTest_sw_odfimport \
-    CppunitTest_sw_uiwriter \
     CppunitTest_sw_mailmerge \
     CppunitTest_sw_globalfilter \
 ))
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index a7ad465..2ca09ee 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -866,20 +866,6 @@ DECLARE_OOXMLEXPORT_TEST(testCommentInitials, "comment_initials.odt")
     assertXPath(pXmlDoc,"/w:comments/w:comment[1]", "initials", "initials");
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTextboxRoundedCorners, "textbox-rounded-corners.docx")
-{
-    uno::Reference<drawing::XShape> xShape = getShape(1);
-    comphelper::SequenceAsHashMap aCustomShapeGeometry = comphelper::SequenceAsHashMap(getProperty< uno::Sequence<beans::PropertyValue> >(xShape, "CustomShapeGeometry"));
-
-    // Test that the shape is a rounded rectangle.
-    CPPUNIT_ASSERT_EQUAL(OUString("ooxml-roundRect"), aCustomShapeGeometry["Type"].get<OUString>());
-
-    // The shape text should start with a table, with "a" in its A1 cell.
-    uno::Reference<text::XText> xText = uno::Reference<text::XTextRange>(xShape, uno::UNO_QUERY)->getText();
-    uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1, xText), uno::UNO_QUERY);
-    uno::Reference<text::XTextRange> xCell(xTable->getCellByName("A1"), uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(OUString("a"), xCell->getString());
-}
 
 DECLARE_OOXMLEXPORT_TEST(testfdo79591, "fdo79591.docx")
 {