diff --git a/frontend/src/components/Inputs/InputUsername.spec.js b/frontend/src/components/Inputs/InputUsername.spec.js
index 3a091f01f..b09ddf328 100644
--- a/frontend/src/components/Inputs/InputUsername.spec.js
+++ b/frontend/src/components/Inputs/InputUsername.spec.js
@@ -29,17 +29,18 @@ describe('UserName Form', () => {
       wrapper = Wrapper()
     })
     it('renders the component', () => {
-      expect(wrapper.find('div.input-username').exists()).toBeTruthy()
+      expect(wrapper.find('[data-test="username"]').exists()).toBeTruthy()
     })
 
     describe('currentValue', () => {
       beforeEach(async () => {
         wrapper = Wrapper()
+
         await wrapper.setProps({ value: 'petra' })
-        await wrapper.find('div.input-username.input[type="text"]').setValue('petra swastiska')
+        await wrapper.find('[data-test="username"]').setValue('petra')
       })
       it('emits input event with the current value', () => {
-        expect(wrapper.emitted('input')).toEqual([['petra swastiska']])
+        expect(wrapper.emitted('input')).toEqual([['petra']])
       })
     })
   })
diff --git a/frontend/src/components/Inputs/InputUsername.vue b/frontend/src/components/Inputs/InputUsername.vue
index 789912f45..4354d0c1d 100644
--- a/frontend/src/components/Inputs/InputUsername.vue
+++ b/frontend/src/components/Inputs/InputUsername.vue
@@ -20,6 +20,7 @@
             type="text"
             :state="validated ? valid : false"
             autocomplete="off"
+            data-test="username"
           ></b-form-input>
           <b-input-group-append>
             <b-button