diff --git a/auth/assets/templates/login.html.tpl b/auth/assets/templates/login.html.tpl
index 622e4223b..3793deb63 100644
--- a/auth/assets/templates/login.html.tpl
+++ b/auth/assets/templates/login.html.tpl
@@ -20,6 +20,7 @@
 			<input
 				type="email"
 				class="form-control"
+				data-test-id="input-email"
 				name="email"
 				required
 				placeholder="{{ tr "login.template.form.email.placeholder" }}"
@@ -36,6 +37,7 @@
 				type="password"
 				required
 				class="form-control"
+				data-test-id="input-password"
 				name="password"
 				placeholder="{{ tr "login.template.form.password.placeholder" }}"
 				autocomplete="current-password"
@@ -45,6 +47,7 @@
 			<div class="col text-right">
 				<button
 					class="btn btn-primary btn-block btn-lg"
+					data-test-id="button-login-and-remember"
 					name="keep-session"
 					value="true"
 					type="submit"
@@ -64,6 +67,7 @@
 			<div class="col text-right">
 				<button
 					class="btn btn-primary btn-block btn-lg"
+					data-test-id="button-login"
 					name="keep-session"
 					value="true"
 					type="submit"
diff --git a/auth/assets/templates/signup.html.tpl b/auth/assets/templates/signup.html.tpl
index bea1ad57a..ce062f5e7 100644
--- a/auth/assets/templates/signup.html.tpl
+++ b/auth/assets/templates/signup.html.tpl
@@ -20,6 +20,7 @@
             <input
                 type="email"
                 class="form-control"
+								data-test-id="input-email"
                 name="email"
                 required
                 placeholder="{{ tr "signup.template.form.email.placeholder" }}"
@@ -34,6 +35,7 @@
 			<input
 				type="password"
 				class="form-control"
+				data-test-id="input-password"
 				name="password"
 				required
 				placeholder="{{ tr "signup.template.form.password.placeholder" }}"
@@ -47,6 +49,7 @@
 			<input
 				type="text"
 				class="form-control"
+				data-test-id="input-name"
 				name="name"
 				placeholder="{{ tr "signup.template.form.name.placeholder" }}"
 				value="{{ .form.name }}"
@@ -60,6 +63,7 @@
 			<input
 				type="text"
 				class="form-control handle-mask"
+				data-test-id="input-handle"
 				name="handle"
 				placeholder="{{ tr "signup.template.form.nickname.placeholder" }}"
 				value="{{ .form.handle }}"
@@ -70,6 +74,7 @@
 			<button
 				id="submit"
 				class="btn btn-primary btn-block btn-lg"
+				data-test-id="button-submit"
 				type="submit"
 			>{{ tr "signup.template.form.button.sign-up" }}</button>
 		</div>