diff --git a/Tests/Unit/Controller/TestimonialControllerTest.php b/Tests/Unit/Controller/TestimonialControllerTest.php
index 31a46cc..b774b4b 100644
--- a/Tests/Unit/Controller/TestimonialControllerTest.php
+++ b/Tests/Unit/Controller/TestimonialControllerTest.php
@@ -24,7 +24,7 @@ use OliverKlee\Tea\Domain\Repository\TestimonialRepository;
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
-class TestimonialControllerTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
+class TestimonialControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var TestimonialController
 	 */
diff --git a/Tests/Unit/Domain/Model/AdditionTest.php b/Tests/Unit/Domain/Model/AdditionTest.php
index c7bef88..69ca465 100644
--- a/Tests/Unit/Domain/Model/AdditionTest.php
+++ b/Tests/Unit/Domain/Model/AdditionTest.php
@@ -19,7 +19,7 @@ namespace OliverKlee\Tea\Tests;
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
-class AdditionTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
+class AdditionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Model\Addition
 	 */
diff --git a/Tests/Unit/Domain/Model/TeaBeverageTest.php b/Tests/Unit/Domain/Model/TeaBeverageTest.php
index 78bd501..a92cc57 100644
--- a/Tests/Unit/Domain/Model/TeaBeverageTest.php
+++ b/Tests/Unit/Domain/Model/TeaBeverageTest.php
@@ -19,7 +19,7 @@ namespace OliverKlee\Tea\Tests;
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
-class TeaBeverageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
+class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Model\TeaBeverage
 	 */
diff --git a/Tests/Unit/Domain/Model/TeaTypeTest.php b/Tests/Unit/Domain/Model/TeaTypeTest.php
index 8df8813..09192a0 100644
--- a/Tests/Unit/Domain/Model/TeaTypeTest.php
+++ b/Tests/Unit/Domain/Model/TeaTypeTest.php
@@ -19,7 +19,7 @@ namespace OliverKlee\Tea\Tests;
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
-class TeaTypeTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
+class TeaTypeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Model\TeaType
 	 */
diff --git a/Tests/Unit/Domain/Model/TestimonialTest.php b/Tests/Unit/Domain/Model/TestimonialTest.php
index 2cd7474..738f2a6 100644
--- a/Tests/Unit/Domain/Model/TestimonialTest.php
+++ b/Tests/Unit/Domain/Model/TestimonialTest.php
@@ -19,7 +19,7 @@ namespace OliverKlee\Tea\Tests;
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
-class TestimonialTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
+class TestimonialTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Model\Testimonial
 	 */
diff --git a/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php b/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php
index 2ebbbac..c4f964a 100644
--- a/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php
+++ b/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php
@@ -19,7 +19,7 @@ namespace OliverKlee\Tea\Tests;
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
-class TeaBeverageRepositoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
+class TeaBeverageRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Model\TeaBeverage
 	 */
diff --git a/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php b/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php
index d6c7802..820082d 100644
--- a/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php
+++ b/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php
@@ -19,7 +19,7 @@ namespace OliverKlee\Tea\Tests;
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
-class TestimonialRepositoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
+class TestimonialRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Model\Testimonial
 	 */
diff --git a/ext_emconf.php b/ext_emconf.php
index 23a8f93..e405ee7 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -30,9 +30,9 @@ $EM_CONF[$_EXTKEY] = array(
 	'version' => '',
 	'constraints' => array(
 		'depends' => array(
-			'extbase' => '6.0.0-6.2.99',
-			'fluid' => '6.0.0-6.2.99',
-			'typo3' => '6.0.0-6.2.99',
+			'extbase' => '6.2.0-7.0.99',
+			'fluid' => '6.2.0-7.0.99',
+			'typo3' => '6.2.0-7.0.99',
 		),
 		'conflicts' => array(
 		),