diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/AttributeAvailabilityTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/AttributeAvailabilityTest.php
new file mode 100755
index 000000000..c870f32ef
--- /dev/null
+++ b/core/lib/Thelia/Tests/Core/Template/Loop/AttributeAvailabilityTest.php
@@ -0,0 +1,51 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Tests\Core\Template\Loop;
+
+use Thelia\Tests\Core\Template\Element\BaseLoopTestor;
+
+use Thelia\Core\Template\Loop\AttributeAvailability;
+
+/**
+ *
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ *
+ */
+class AttributeAvailabilityTest extends BaseLoopTestor
+{
+    public function getTestedClassName()
+    {
+        return 'Thelia\Core\Template\Loop\AttributeAvailability';
+    }
+
+    public function getTestedInstance()
+    {
+        return new AttributeAvailability($this->request, $this->dispatcher, $this->securityContext);
+    }
+
+    public function getMandatoryArguments()
+    {
+        return array();
+    }
+}
diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/FeatureAvailableTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/AttributeTest.php
similarity index 89%
rename from core/lib/Thelia/Tests/Core/Template/Loop/FeatureAvailableTest.php
rename to core/lib/Thelia/Tests/Core/Template/Loop/AttributeTest.php
index e93b05a69..653de34e9 100755
--- a/core/lib/Thelia/Tests/Core/Template/Loop/FeatureAvailableTest.php
+++ b/core/lib/Thelia/Tests/Core/Template/Loop/AttributeTest.php
@@ -25,23 +25,23 @@ namespace Thelia\Tests\Core\Template\Loop;
 
 use Thelia\Tests\Core\Template\Element\BaseLoopTestor;
 
-use Thelia\Core\Template\Loop\FeatureAvailable;
+use Thelia\Core\Template\Loop\Attribute;
 
 /**
  *
  * @author Etienne Roudeix <eroudeix@openstudio.fr>
  *
  */
-class FeatureAvailableTest extends BaseLoopTestor
+class AttributeTest extends BaseLoopTestor
 {
     public function getTestedClassName()
     {
-        return 'Thelia\Core\Template\Loop\FeatureAvailable';
+        return 'Thelia\Core\Template\Loop\Attribute';
     }
 
     public function getTestedInstance()
     {
-        return new FeatureAvailable($this->request, $this->dispatcher, $this->securityContext);
+        return new Attribute($this->request, $this->dispatcher, $this->securityContext);
     }
 
     public function getMandatoryArguments()
diff --git a/core/lib/Thelia/Tests/Core/Template/Loop/FeatureAvailabilityTest.php b/core/lib/Thelia/Tests/Core/Template/Loop/FeatureAvailabilityTest.php
new file mode 100755
index 000000000..d3a045f33
--- /dev/null
+++ b/core/lib/Thelia/Tests/Core/Template/Loop/FeatureAvailabilityTest.php
@@ -0,0 +1,51 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Tests\Core\Template\Loop;
+
+use Thelia\Tests\Core\Template\Element\BaseLoopTestor;
+
+use Thelia\Core\Template\Loop\FeatureAvailability;
+
+/**
+ *
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ *
+ */
+class FeatureAvailabilityTest extends BaseLoopTestor
+{
+    public function getTestedClassName()
+    {
+        return 'Thelia\Core\Template\Loop\FeatureAvailability';
+    }
+
+    public function getTestedInstance()
+    {
+        return new FeatureAvailability($this->request, $this->dispatcher, $this->securityContext);
+    }
+
+    public function getMandatoryArguments()
+    {
+        return array();
+    }
+}