diff --git a/src/test/php/PHPMD/Rule/Controversial/CamelCaseVariableNameTest.php b/src/test/php/PHPMD/Rule/Controversial/CamelCaseVariableNameTest.php
new file mode 100644
index 000000000..306c2cd76
--- /dev/null
+++ b/src/test/php/PHPMD/Rule/Controversial/CamelCaseVariableNameTest.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * This file is part of PHP Mess Detector.
+ *
+ * PHP Version 5
+ *
+ * Copyright (c) 2008-2012, Manuel Pichler <mapi@phpmd.org>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Manuel Pichler nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @author    Manuel Pichler <mapi@phpmd.org>
+ * @copyright 2008-2014 Manuel Pichler. All rights reserved.
+ * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version   @project.version@
+ */
+
+namespace PHPMD\Rule\Controversial;
+
+use PHPMD\AbstractTest;
+
+/**
+ * Test case for the camel case variable name rule.
+ *
+ *
+ * @author    Manuel Pichler <mapi@phpmd.org>
+ * @copyright 2008-2014 Manuel Pichler. All rights reserved.
+ * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version   @project.version@
+ *
+ * @covers \PHPMD\Rule\Controversial\CamelCaseVariableName
+ * @group phpmd
+ * @group phpmd::rule
+ * @group phpmd::rule::controversial
+ * @group unittest
+ */
+class CamelCaseVariableNameTest extends AbstractTest
+{
+    /**
+     * Tests that the rule does apply for an invalid variable name
+     * @return void
+     */
+    public function testRuleDoesApplyForInvariableNameWithUnderscore()
+    {
+        $report = $this->getReportMock(1);
+
+        $rule = new CamelCaseVariableName();
+        $rule->setReport($report);
+        $rule->apply($this->getClass());
+    }
+
+    /**
+     * Tests that the rule does apply for an invalid variable name
+     * starting with a capital.
+     *
+     * @return void
+     */
+    public function testRuleDoesApplyForVariableNameWithCapital()
+    {
+        $report = $this->getReportMock(1);
+
+        $rule = new CamelCaseVariableName();
+        $rule->setReport($report);
+        $rule->apply($this->getClass());
+    }
+
+    /**
+     * Tests that the rule does NOT apply for a valid variable name
+     *
+     * @return void
+     */
+    public function testRuleDoesNotApplyForValidVariableName()
+    {
+        $report = $this->getReportMock(0);
+
+        $rule = new CamelCaseVariableName();
+        $rule->setReport($report);
+        $rule->apply($this->getClass());
+    }
+}
diff --git a/src/test/resources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesApplyForInvariableNameWithUnderscore.php b/src/test/resources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesApplyForInvariableNameWithUnderscore.php
new file mode 100644
index 000000000..5a71c9fc3
--- /dev/null
+++ b/src/test/resources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesApplyForInvariableNameWithUnderscore.php
@@ -0,0 +1,8 @@
+<?php
+class testRuleDoesApplyForInvariableNameWithUnderscore
+{
+    public function invalidVariableNameWithUnderscore()
+    {
+        $data_module = 'foo';
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesApplyForVariableNameWithCapital.php b/src/test/resources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesApplyForVariableNameWithCapital.php
new file mode 100644
index 000000000..621ef5920
--- /dev/null
+++ b/src/test/resources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesApplyForVariableNameWithCapital.php
@@ -0,0 +1,8 @@
+<?php
+class testRuleDoesApplyForVariableNameWithCapital
+{
+    public function validCapitalVariableName()
+    {
+        $DataModule = 'foo';
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesNotApplyForValidVariableName.php b/src/test/resources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesNotApplyForValidVariableName.php
new file mode 100644
index 000000000..2c48bd297
--- /dev/null
+++ b/src/test/resources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesNotApplyForValidVariableName.php
@@ -0,0 +1,8 @@
+<?php
+class testRuleDoesNotApplyForValidVariableName
+{
+    public function validVariableName()
+    {
+        $dataModule = 'foo';
+    }
+}
\ No newline at end of file