diff --git a/tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php b/tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php
index c65ef2ff..1753b687 100644
--- a/tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php
+++ b/tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php
@@ -19,6 +19,10 @@ class UndefinedTemplateVarTest extends PHPUnit_Smarty
         error_reporting(E_ALL | E_STRICT);
     }
 
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
     /**
      * Test E_NOTICE suppression template fetched by Smarty object
      */
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignBCTest.php b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignBCTest.php
index 5f87bcae..eff71dee 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignBCTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignBCTest.php
@@ -25,7 +25,7 @@ class ClearAllAssignBCTest extends PHPUnit_Smarty
         $this->setUpSmarty(dirname(__FILE__));
 
         $this->smartyBC->assign('foo', 'foo');
-        $this->_dataBC = new Smarty_Data($this->smartyBC);
+        $this->_dataBC = $this->smartyBC->createData($this->smartyBC);
         $this->_dataBC->assign('bar', 'bar');
         $this->_tplBC = $this->smartyBC->createTemplate('eval:{$foo}{$bar}{$blar}', null, null, $this->_dataBC);
         $this->_tplBC->assign('blar', 'blar');
diff --git a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignTest.php b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignTest.php
index b3c66483..2b3b3cac 100644
--- a/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/ClearAllAssign/ClearAllAssignTest.php
@@ -23,12 +23,16 @@ class ClearAllAssignTest extends PHPUnit_Smarty
         $this->setUpSmarty(dirname(__FILE__));
 
         $this->smarty->assign('foo', 'foo');
-        $this->_data = new Smarty_Data($this->smarty);
+        $this->_data = $this->smarty->createData($this->smarty);
         $this->_data->assign('bar', 'bar');
         $this->_tpl = $this->smarty->createTemplate('eval:{$foo}{$bar}{$blar}', null, null, $this->_data);
         $this->_tpl->assign('blar', 'blar');
     }
 
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
     /**
      * test all variables accessable
      */
diff --git a/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsTest.php b/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsTest.php
index fff0c375..7fd71f1e 100644
--- a/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsTest.php
+++ b/tests/UnitTests/SmartyMethodsTests/GetTemplateVars/GetTemplateVarsTest.php
@@ -53,8 +53,8 @@ class GetTemplateVarsTest extends PHPUnit_Smarty
      */
     public function testGetSingleTemplateVarScopeAll()
     {
-        $data1 = new Smarty_Data($this->smarty);
-        $data2 = new Smarty_Data($data1);
+        $data1 = $this->smarty->createData($this->smarty);
+        $data2 = $this->smarty->createData($data1);
         $this->smarty->assign('foo', 'bar');
         $this->smarty->assign('blar', 'buh');
         $this->assertEquals("bar", $this->smarty->getTemplateVars('foo', $data2));
@@ -65,8 +65,8 @@ class GetTemplateVarsTest extends PHPUnit_Smarty
      */
     public function testGetAllTemplateVarsScopeAll()
     {
-        $data1 = new Smarty_Data($this->smarty);
-        $data2 = new Smarty_Data($data1);
+        $data1 = $this->smarty->createData($this->smarty);
+        $data2 = $this->smarty->createData($data1);
         $this->smarty->assign('foo', 'bar');
         $data1->assign('blar', 'buh');
         $data2->assign('foo2', 'bar2');
@@ -82,8 +82,8 @@ class GetTemplateVarsTest extends PHPUnit_Smarty
      */
     public function testGetAllTemplateVarsScopeAllNoParents()
     {
-        $data1 = new Smarty_Data($this->smarty);
-        $data2 = new Smarty_Data($data1);
+        $data1 = $this->smarty->createData($this->smarty);
+        $data2 = $this->smarty->createData($data1);
         $this->smarty->assign('foo', 'bar');
         $data1->assign('blar', 'buh');
         $data2->assign('foo2', 'bar2');
@@ -100,8 +100,8 @@ class GetTemplateVarsTest extends PHPUnit_Smarty
     public function testGetSingleTemplateVarsScopeAllNoParents()
     {
         error_reporting(error_reporting() & ~(E_NOTICE | E_USER_NOTICE));
-        $data1 = new Smarty_Data($this->smarty);
-        $data2 = new Smarty_Data($data1);
+        $data1 = $this->smarty->createData($this->smarty);
+        $data2 = $this->smarty->createData($data1);
         $this->smarty->assign('foo', 'bar');
         $data1->assign('blar', 'buh');
         $data2->assign('foo2', 'bar2');