diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
index 9272d588648..70e18271400 100644
--- a/src/View/Helper/FormHelper.php
+++ b/src/View/Helper/FormHelper.php
@@ -26,8 +26,8 @@
 use Cake\View\Form\EntityContext;
 use Cake\View\Form\NullContext;
 use Cake\View\Helper;
-use Cake\View\StringTemplate;
 use Cake\View\Helper\StringTemplateTrait;
+use Cake\View\StringTemplate;
 use Cake\View\View;
 use Cake\View\Widget\InputRegistry;
 use DateTime;
diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php
index 6a26ec232db..882ce495494 100644
--- a/tests/TestCase/View/Helper/FormHelperTest.php
+++ b/tests/TestCase/View/Helper/FormHelperTest.php
@@ -31,7 +31,6 @@
 use Cake\View\Helper\HtmlHelper;
 use Cake\View\View;
 
-
 /**
  * Test stub.
  */
@@ -1106,7 +1105,6 @@ public function testGetFormWithFalseModel() {
 		$this->assertTags($result, $expected);
 	}
 
-
 /**
  * testFormCreateWithSecurity method
  *