diff --git a/tests/Forms/Forms.renderer.1.phpt b/tests/Forms/Forms.renderer.1.phpt
index e48aa102c..228c68962 100644
--- a/tests/Forms/Forms.renderer.1.phpt
+++ b/tests/Forms/Forms.renderer.1.phpt
@@ -127,4 +127,4 @@ $form->setDefaults($defaults);
 $form->onSuccess[] = function () {};
 $form->fireEvents();
 
-Assert::matchFile(__DIR__ . '/Forms.renderer.1.expect', $form->__toString(true));
+Assert::matchFile(__DIR__ . '/expected/Forms.renderer.1.expect', $form->__toString(true));
diff --git a/tests/Forms/Forms.renderer.2.phpt b/tests/Forms/Forms.renderer.2.phpt
index 201a2fe88..29ecdc51b 100644
--- a/tests/Forms/Forms.renderer.2.phpt
+++ b/tests/Forms/Forms.renderer.2.phpt
@@ -132,4 +132,4 @@ $form->setDefaults($defaults);
 $form->onSuccess[] = function () {};
 $form->fireEvents();
 
-Assert::matchFile(__DIR__ . '/Forms.renderer.2.expect', $form->__toString(true));
+Assert::matchFile(__DIR__ . '/expected/Forms.renderer.2.expect', $form->__toString(true));
diff --git a/tests/Forms/Forms.renderer.5.phpt b/tests/Forms/Forms.renderer.5.phpt
index 7f6b53371..c35e056e6 100644
--- a/tests/Forms/Forms.renderer.5.phpt
+++ b/tests/Forms/Forms.renderer.5.phpt
@@ -48,4 +48,4 @@ $form->addSubmit('submit', 'Order');
 
 $form->fireEvents();
 
-Assert::matchFile(__DIR__ . '/Forms.renderer.5.expect', $form->__toString(true));
+Assert::matchFile(__DIR__ . '/expected/Forms.renderer.5.expect', $form->__toString(true));
diff --git a/tests/Forms/Forms.renderer.translate.phpt b/tests/Forms/Forms.renderer.translate.phpt
index d1b8b7267..65c3f2061 100644
--- a/tests/Forms/Forms.renderer.translate.phpt
+++ b/tests/Forms/Forms.renderer.translate.phpt
@@ -42,7 +42,7 @@ $form->addPassword('password', 'Password')
 $form->addSubmit('submit', 'Send');
 
 
-Assert::matchFile(__DIR__ . '/Forms.renderer.translate.expect', $form->__toString(true));
+Assert::matchFile(__DIR__ . '/expected/Forms.renderer.translate.expect', $form->__toString(true));
 
 
 // Checking whether translation is not duplicated
diff --git a/tests/Forms/Forms.renderer.1.expect b/tests/Forms/expected/Forms.renderer.1.expect
similarity index 100%
rename from tests/Forms/Forms.renderer.1.expect
rename to tests/Forms/expected/Forms.renderer.1.expect
diff --git a/tests/Forms/Forms.renderer.2.expect b/tests/Forms/expected/Forms.renderer.2.expect
similarity index 100%
rename from tests/Forms/Forms.renderer.2.expect
rename to tests/Forms/expected/Forms.renderer.2.expect
diff --git a/tests/Forms/Forms.renderer.5.expect b/tests/Forms/expected/Forms.renderer.5.expect
similarity index 100%
rename from tests/Forms/Forms.renderer.5.expect
rename to tests/Forms/expected/Forms.renderer.5.expect
diff --git a/tests/Forms/Forms.renderer.translate.expect b/tests/Forms/expected/Forms.renderer.translate.expect
similarity index 100%
rename from tests/Forms/Forms.renderer.translate.expect
rename to tests/Forms/expected/Forms.renderer.translate.expect