diff --git a/tests/tine20/Tinebase/Frontend/JsonTest.php b/tests/tine20/Tinebase/Frontend/JsonTest.php
index 134c67a529..19637f28f6 100644
--- a/tests/tine20/Tinebase/Frontend/JsonTest.php
+++ b/tests/tine20/Tinebase/Frontend/JsonTest.php
@@ -696,28 +696,14 @@ public function testGetAllRegistryData()
         $symbols = Zend_Locale::getTranslationList('symbols', $locale);
         self::assertEquals($symbols['decimal'], $registryData['Tinebase']['decimalSeparator']);
 
-        if (Sales_Config::getInstance()->featureEnabled(Sales_Config::FEATURE_INVOICES_MODULE)) {
-            $configuredSalesModels = array_keys($registryData['Sales']['models']);
-            self::assertTrue(in_array('Invoice', $configuredSalesModels), 'Invoices is missing from configured models: '
-                . print_r($configuredSalesModels, true));
-            $copyOmitFields = array(
-                'billed_in',
-                'invoice_id',
-                'status',
-                'cleared_at',
-                'relations',
-            );
-        } else {
-            $copyOmitFields = array(
-                'billed_in',
-                'status',
-                'cleared_at',
-                'relations',
-            );
-        }
-
         self::assertTrue(isset($registryData['Timetracker']['models']['Timeaccount']['copyOmitFields']), 'Timeaccount copyOmitFields empty/missing');
-        self::assertEquals($copyOmitFields, $registryData['Timetracker']['models']['Timeaccount']['copyOmitFields']);
+        self::assertEquals([
+            'billed_in',
+            'invoice_id',
+            'status',
+            'cleared_at',
+            'relations',
+        ], $registryData['Timetracker']['models']['Timeaccount']['copyOmitFields']);
         self::assertTrue(is_array(($registryData['Timetracker']['relatableModels'][0])), 'relatableModels needs to be an numbered array');
 
         $this->_assertImportExportDefinitions($registryData);
diff --git a/tests/tine20/Tinebase/ModelConfigurationTest.php b/tests/tine20/Tinebase/ModelConfigurationTest.php
index 94455c03bc..ff0db6c915 100644
--- a/tests/tine20/Tinebase/ModelConfigurationTest.php
+++ b/tests/tine20/Tinebase/ModelConfigurationTest.php
@@ -37,22 +37,6 @@ public function testModelCreationTraditional()
         $this->assertNull($cObj);
     }
 
-    /**
-     * tests if the modelconfiguration is created for foreign record keys that are disabled by a feature switch
-     */
-    public function testModelConfigWithDisabledForeignRecords()
-    {
-        // TODO disable feature first
-        if (Sales_Config::getInstance()->featureEnabled(Sales_Config::FEATURE_INVOICES_MODULE)) {
-            $this->markTestSkipped('only testable when disabled');
-        }
-
-        $timesheet = new Timetracker_Model_Timesheet(array(), true);
-        $mcFields = $timesheet->getConfiguration()->getFields();
-        $this->assertEquals('string', $mcFields['invoice_id']['type']);
-        $this->assertEquals(null, $mcFields['invoice_id']['label']);
-    }
-
     /**
      * testModelConfigWithDisabledRelationApp
      */