diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Variables/CmsVariableProviderTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Variables/CmsVariableProviderTest.php
deleted file mode 100644
index 1e453cfb448792bb2bfa8e2233ad5d61c5c58c1d..0000000000000000000000000000000000000000
--- a/typo3/sysext/fluid/Tests/Unit/Core/Variables/CmsVariableProviderTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-namespace TYPO3\CMS\Fluid\Tests\Unit\Core\Variables;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-use TYPO3\CMS\Fluid\Core\Variables\CmsVariableProvider;
-
-/**
- * Test case
- */
-class CmsVariableProviderTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
-{
-    /**
-     * @test
-     */
-    public function getByPathDelegatesToObjectAccess()
-    {
-        $instance = new CmsVariableProvider();
-        $instance->setSource(['foo' => 'bar']);
-        $this->assertEquals('bar', $instance->getByPath('foo'));
-    }
-
-    /**
-     * @test
-     */
-    public function dynamicAccessWorks()
-    {
-        $instance = new CmsVariableProvider();
-        $instance->setSource(
-            [
-                'foo' => [
-                    'hello' => 'world',
-                ],
-                'key' => 'hello'
-            ]
-        );
-        $this->assertEquals('world', $instance->getByPath('foo.{key}'));
-    }
-}
diff --git a/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php b/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
index 771ed7a3fb06cf193e5d0706404f24c33192dbeb..bc02f00321d55b52d084c77e017288dbcf63779f 100644
--- a/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
@@ -21,11 +21,11 @@ use TYPO3\CMS\Extbase\Mvc\Web\Request;
 use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
 use TYPO3\CMS\Fluid\Core\Parser\PreProcessor\XmlnsNamespaceTemplatePreProcessor;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
-use TYPO3\CMS\Fluid\Core\Variables\CmsVariableProvider;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3\CMS\Fluid\View\TemplatePaths;
 use TYPO3Fluid\Core\Compiler\TemplateCompiler;
 use TYPO3Fluid\Fluid\Core\Parser\TemplateParser;
+use TYPO3Fluid\Fluid\Core\Variables\StandardVariableProvider;
 use TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer;
 
 /**
@@ -89,7 +89,7 @@ class StandaloneViewTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
     protected $mockTemplatePaths;
 
     /**
-     * @var CmsVariableProvider|\PHPUnit_Framework_MockObject_MockObject
+     * @var StandardVariableProvider|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $mockVariableProvider;