diff --git a/tests/_pages/ContactPage.php b/tests/_pages/ContactPage.php
index c11f77b..18015b5 100644
--- a/tests/_pages/ContactPage.php
+++ b/tests/_pages/ContactPage.php
@@ -17,6 +17,6 @@ class ContactPage extends BasePage
 			$inputType = $field === 'body' ? 'textarea' : 'input';
 			$this->guy->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value);
 		}
-		$this->guy->click('#contact-form button[type=submit]');
+		$this->guy->click('contact-button');
 	}
 }
diff --git a/tests/_pages/LoginPage.php b/tests/_pages/LoginPage.php
index 0b73dca..503a420 100644
--- a/tests/_pages/LoginPage.php
+++ b/tests/_pages/LoginPage.php
@@ -16,6 +16,6 @@ class LoginPage extends BasePage
 	{
 		$this->guy->fillField('input[name="LoginForm[username]"]', $username);
 		$this->guy->fillField('input[name="LoginForm[password]"]', $password);
-		$this->guy->click('#login-form button[type=submit]');
+		$this->guy->click('login-button');
 	}
 }
diff --git a/views/site/contact.php b/views/site/contact.php
index 964dbb8..c375161 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -48,7 +48,7 @@ $this->params['breadcrumbs'][] = $this->title;
 					'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
 				]) ?>
 				<div class="form-group">
-					<?= Html::submitButton('Submit', ['class' => 'btn btn-primary']) ?>
+					<?= Html::submitButton('Submit', ['class' => 'btn btn-primary', 'name' => 'contact-button']) ?>
 				</div>
 			<?php ActiveForm::end(); ?>
 		</div>
diff --git a/views/site/login.php b/views/site/login.php
index da022d6..7d14c54 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -34,7 +34,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
 	<div class="form-group">
 		<div class="col-lg-offset-1 col-lg-11">
-			<?= Html::submitButton('Login', ['class' => 'btn btn-primary']) ?>
+			<?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
 		</div>
 	</div>