diff --git a/app/components/user-status.hbs b/app/components/user-status.hbs
index 345ef6fc..1fa37eaa 100644
--- a/app/components/user-status.hbs
+++ b/app/components/user-status.hbs
@@ -3,21 +3,21 @@
     <Spinner />
   </div>
 {{else}}
-<div class="heading">
+<div data-test-heading class="heading">
   {{#each this.currentUserStatus as |currentStatus|}}
   {{#if (eq @status currentStatus.status)}}
     {{#if (eq currentStatus.status "ONBOARDING")}}
       <div data-test-onboarding-details class="onboarding-details">
         <h2 data-test-status>You are undergoing onboarding</h2>
-        <p data-test-details>
+        <p data-test-details-p1>
           If you are a Developer, please complete your submission for 
           <a href="https://github.com/Real-Dev-Squad/lift-simulation">Lift Simulation</a>, 
           and ask for doubts in the team chat on Discord.
         </p>
-        <p data-test-details>If you are not a developer, please contact Ankush for next steps.</p>
+        <p data-test-details-p2>If you are not a developer, please contact Ankush for next steps.</p>
         <button class="buttons__active" type="button"  {disabled={{@isStatusUpdating}} {{on "click" (fn
           this.changeStatus "ACTIVE" )}} data-test-active-button>
-          <span>Change your status to Active</span>
+          <span data-test-btn-label="ACTIVE">Change your status to Active</span>
         </button>
       </div>
     {{else}}
@@ -27,12 +27,12 @@
   {{/each}}
 </div>
 
-<div class="buttons">
+<div data-test-btn-div class="buttons">
   {{#each this.currentUserStatus as |currentStatus|}}
     {{#if (eq @status currentStatus.status)}}
       {{#each currentStatus.otherAvailableStatus as |otherPossibleStatus|}}
-        <button class={{otherPossibleStatus.class}} type="button" disabled={{@isStatusUpdating}} {{on "click" (fn this.changeStatus otherPossibleStatus.status )}}>
-          <span>{{otherPossibleStatus.message}}</span>
+        <button data-test-btn={{otherPossibleStatus.status}} class={{otherPossibleStatus.class}} type="button" disabled={{@isStatusUpdating}} {{on "click" (fn this.changeStatus otherPossibleStatus.status )}}>
+          <span data-test-btn-label={{otherPossibleStatus.status}}>{{otherPossibleStatus.message}}</span>
         </button>
       {{/each}}
     {{/if}}
diff --git a/tests/integration/components/user-status-test.js b/tests/integration/components/user-status-test.js
new file mode 100644
index 00000000..be6371e8
--- /dev/null
+++ b/tests/integration/components/user-status-test.js
@@ -0,0 +1,150 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+import { hbs } from 'ember-cli-htmlbars';
+
+module('Integration | Component | user-status-modal', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('status is "DNE"', async function (assert) {
+    this.setProperties({
+      status: 'DNE',
+      isStatusUpdating: false,
+    });
+    await render(hbs`
+            <UserStatus 
+                @status={{this.status}} 
+                @isStatusUpdating={{this.isStatusUpdating}}
+            />
+            `);
+
+    assert.dom('[data-test-heading]').exists();
+    assert.dom('[data-test-status]').hasText("Your Status doesn't exist");
+
+    assert.dom('[data-test-btn-div]').exists();
+    assert.dom('[data-test-btn="ACTIVE"]').exists();
+    assert
+      .dom('[data-test-btn-label="ACTIVE"]')
+      .hasText('Change your status to Active');
+
+    assert.dom('[data-test-btn="IDLE"]').exists();
+    assert
+      .dom('[data-test-btn-label="IDLE"]')
+      .hasText('Change your status to Idle');
+
+    assert.dom('[data-test-btn="OOO"]').exists();
+    assert
+      .dom('[data-test-btn-label="OOO"]')
+      .hasText('Change your status to OOO');
+  });
+
+  test('status is "ONBOARDING"', async function (assert) {
+    this.setProperties({
+      status: 'ONBOARDING',
+      isStatusUpdating: false,
+    });
+    await render(hbs`
+            <UserStatus 
+                @status={{this.status}} 
+                @isStatusUpdating={{this.isStatusUpdating}}
+            />
+            `);
+
+    assert.dom('[data-test-heading]').exists();
+    assert.dom('[data-test-onboarding-details]').exists();
+    assert.dom('[data-test-status]').hasText('You are undergoing onboarding');
+    assert
+      .dom('[data-test-details-p1]')
+      .hasText(
+        'If you are a Developer, please complete your submission for Lift Simulation, and ask for doubts in the team chat on Discord.'
+      );
+    assert
+      .dom('[data-test-details-p2]')
+      .hasText(
+        'If you are not a developer, please contact Ankush for next steps.'
+      );
+    assert.dom('[data-test-active-button]').exists();
+    assert
+      .dom('[data-test-btn-label="ACTIVE"]')
+      .hasText('Change your status to Active');
+  });
+
+  test('status is "ACTIVE"', async function (assert) {
+    this.setProperties({
+      status: 'ACTIVE',
+      isStatusUpdating: false,
+    });
+    await render(hbs`
+            <UserStatus 
+                @status={{this.status}} 
+                @isStatusUpdating={{this.isStatusUpdating}}
+            />
+            `);
+    assert.dom('[data-test-heading]').exists();
+    assert.dom('[data-test-status]').hasText('You are Active');
+
+    assert.dom('[data-test-btn-div]').exists();
+    assert.dom('[data-test-btn="IDLE"]').exists();
+    assert
+      .dom('[data-test-btn-label="IDLE"]')
+      .hasText('Change your status to Idle');
+
+    assert.dom('[data-test-btn="OOO"]').exists();
+    assert
+      .dom('[data-test-btn-label="OOO"]')
+      .hasText('Change your status to OOO');
+  });
+
+  test('status is "IDLE"', async function (assert) {
+    this.setProperties({
+      status: 'IDLE',
+      isStatusUpdating: false,
+    });
+    await render(hbs`
+            <UserStatus 
+                @status={{this.status}} 
+                @isStatusUpdating={{this.isStatusUpdating}}
+            />
+            `);
+    assert.dom('[data-test-heading]').exists();
+    assert.dom('[data-test-status]').hasText('You are Idle');
+
+    assert.dom('[data-test-btn-div]').exists();
+    assert.dom('[data-test-btn="ACTIVE"]').exists();
+    assert
+      .dom('[data-test-btn-label="ACTIVE"]')
+      .hasText('Change your status to Active');
+
+    assert.dom('[data-test-btn="OOO"]').exists();
+    assert
+      .dom('[data-test-btn-label="OOO"]')
+      .hasText('Change your status to OOO');
+  });
+
+  test('status is "OOO"', async function (assert) {
+    this.setProperties({
+      status: 'OOO',
+      isStatusUpdating: false,
+    });
+    await render(hbs`
+            <UserStatus 
+                @status={{this.status}} 
+                @isStatusUpdating={{this.isStatusUpdating}}
+            />
+            `);
+
+    assert.dom('[data-test-heading]').exists();
+    assert.dom('[data-test-status]').hasText('You are OOO');
+
+    assert.dom('[data-test-btn-div]').exists();
+    assert.dom('[data-test-btn="ACTIVE"]').exists();
+    assert
+      .dom('[data-test-btn-label="ACTIVE"]')
+      .hasText('Change your status to Active');
+
+    assert.dom('[data-test-btn="IDLE"]').exists();
+    assert
+      .dom('[data-test-btn-label="IDLE"]')
+      .hasText('Change your status to Idle');
+  });
+});