diff --git a/app/mirage/config.js b/app/mirage/config.js
index 929ea8a..c03b469 100644
--- a/app/mirage/config.js
+++ b/app/mirage/config.js
@@ -10,7 +10,10 @@ export function testConfig() {
   this.namespace = '/api/hymenobacter';
   this.timing = 0;
 
+  this.get('/users');
+  this.post('/users');
   this.get('/users/:id');
+  this.put('/users/:id');
 
   this.get('/species');
   this.post('/species');
diff --git a/app/pods/protected/users/index/template.hbs b/app/pods/protected/users/index/template.hbs
index adb5b55..5354e95 100644
--- a/app/pods/protected/users/index/template.hbs
+++ b/app/pods/protected/users/index/template.hbs
@@ -1,5 +1,5 @@
 <h2>{{genus-name}} Users</h2>
-<h3>Total users: {{model.length}}</h3>
+<h3 id="total-users">Total users: {{model.length}}</h3>
 
 <table class="flakes-table">
   <thead>
diff --git a/app/pods/protected/users/user-form/template.hbs b/app/pods/protected/users/user-form/template.hbs
index c6209a9..e7a8b02 100644
--- a/app/pods/protected/users/user-form/template.hbs
+++ b/app/pods/protected/users/user-form/template.hbs
@@ -4,7 +4,7 @@
     <div data-row-span="1">
       <div data-field-span="1">
         <label>Name</label>
-        {{input value=user.name}}
+        {{input value=user.name class="user-name"}}
       </div>
     </div>
     <div data-row-span="1">
@@ -33,7 +33,7 @@
     Cancel
   </a>
   {{#if user.hasDirtyAttributes}}
-    <button type="submit" class="button-green smaller">
+    <button type="submit" class="button-green smaller save-user">
       Save
     </button>
   {{/if}}
diff --git a/app/pods/users/new/template.hbs b/app/pods/users/new/template.hbs
index d6e81c5..e8e6e2c 100644
--- a/app/pods/users/new/template.hbs
+++ b/app/pods/users/new/template.hbs
@@ -6,22 +6,22 @@
         <ul>
           <li>
             <label>Name</label>
-            {{input value=user.name}}
+            {{input value=user.name class="user-name"}}
           </li>
           <li>
             <label>Email</label>
-            {{input value=user.email}}
+            {{input value=user.email class="email"}}
           </li>
           <li>
             <label>Password</label>
-            {{input type="password" value=user.password}}
+            {{input type="password" value=user.password class="password"}}
           </li>
           <li>
             <label>Password (confirm)</label>
-            {{input type="password" value=passwordConfirm}}
+            {{input type="password" value=passwordConfirm class="password-verify"}}
           </li>
           <li>
-            <button type="submit" class="button-green smaller">
+            <button type="submit" class="button-green smaller save-user">
               Submit
             </button>
           </li>
diff --git a/tests/acceptance/users-test.js b/tests/acceptance/users-test.js
new file mode 100644
index 0000000..ed08d72
--- /dev/null
+++ b/tests/acceptance/users-test.js
@@ -0,0 +1,77 @@
+import Ember from 'ember';
+import { module, test } from 'qunit';
+import startApp from '../helpers/start-app';
+import { invalidateSession, authenticateSession } from '../helpers/ember-simple-auth';
+
+module('Acceptance | users', {
+  beforeEach: function() {
+    this.application = startApp();
+    authenticateSession(this.application, {
+      access_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWN0ZGIiLCJzdWIiOiIxIiwiZXhwIjoxNDQ2NTAyMjI2LCJpYXQiOjE0NDY0OTg2MjZ9.vIjKHAsp2TkCV505EbtCo2xQT-2oQkB-Nv5y0b6E7Mg"
+    });
+    server.create('users', { role: 'A', canEdit: true });
+  },
+
+  afterEach: function() {
+    Ember.run(this.application, 'destroy');
+  }
+});
+
+test('visiting /users', function(assert) {
+  const users = server.createList('users', 19); // We already created one user in beforeEach
+  visit('/users');
+
+  andThen(function() {
+    assert.equal(currentURL(), '/users');
+    assert.equal(find(".flakes-table > tbody > tr").length, users.length + 1);
+    assert.equal(find("#total-users").text(), "Total users: 20");
+  });
+});
+
+
+test('visiting /users/:id', function(assert) {
+  const user = server.create('users');
+  visit(`/users/${user.id}`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/users/${user.id}`);
+    assert.equal(find(".flakes-information-box > legend").text().trim(), user.name);
+  });
+});
+
+test('editing /users/:id/edit', function(assert) {
+  const user = server.create('users', { 'canEdit': true });
+  visit(`/users/${user.id}/edit`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/users/${user.id}/edit`);
+
+    fillIn('.user-name', 'Revised User Name');
+    click('.save-user');
+
+    andThen(function() {
+      assert.equal(currentURL(), `/users/${user.id}`);
+      assert.equal(find(".flakes-information-box > legend").text().trim(), 'Revised User Name');
+    });
+  });
+});
+
+test('creating /users/new', function(assert) {
+  invalidateSession(this.application);
+  visit(`/users/new`);
+
+  andThen(function() {
+    assert.equal(currentURL(), `/users/new`);
+    fillIn('.user-name', 'New User Name');
+    fillIn('.email', 'example@example.com');
+    fillIn('.password', 'Password1');
+    fillIn('.password-verify', 'Password1');
+    click('.save-user');
+
+    andThen(function() {
+      assert.equal(currentURL(), `/login`);
+      assert.equal(find(".flakes-message").text().trim(), `✖ You have successfully signed up.
+              Please check your email for further instructions.`);
+    });
+  });
+});