diff --git a/app/views/profiles/personal_access_tokens/index.html.haml b/app/views/profiles/personal_access_tokens/index.html.haml
index 72e67df4337..e61fa69af54 100644
--- a/app/views/profiles/personal_access_tokens/index.html.haml
+++ b/app/views/profiles/personal_access_tokens/index.html.haml
@@ -32,7 +32,7 @@
 
     - if @active_personal_access_tokens.exists?
       .table-responsive
-        %table.table.table-striped.table-hover
+        %table.table.table-striped.table-hover.active-personal-access-tokens
           %thead
             %tr
               %th Name
@@ -66,7 +66,7 @@
 
     - if @inactive_personal_access_tokens.exists?
       .table-responsive
-        %table.table.table-striped.table-hover
+        %table.table.table-striped.table-hover.inactive-personal-access-tokens
           %thead
             %tr
               %th Name
diff --git a/spec/features/profiles/personal_access_tokens_spec.rb b/spec/features/profiles/personal_access_tokens_spec.rb
new file mode 100644
index 00000000000..ce972776ffe
--- /dev/null
+++ b/spec/features/profiles/personal_access_tokens_spec.rb
@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe 'Profile > Personal Access Tokens', feature: true do
+  let(:user) { create(:user) }
+
+  before do
+    login_as(user)
+  end
+
+  describe "token creation" do
+    it "allows creation of a token with an optional expiry date" do
+      visit profile_personal_access_tokens_path
+      fill_in "Name", with: FFaker::Product.brand
+      expect {click_on "Add Personal Access Token"}.to change { PersonalAccessToken.count }.by(1)
+
+      active_personal_access_tokens = find(".table.active-personal-access-tokens").native.inner_html
+      expect(active_personal_access_tokens).to match(PersonalAccessToken.last.name)
+      expect(active_personal_access_tokens).to match("Never")
+      expect(active_personal_access_tokens).to match(PersonalAccessToken.last.token)
+
+      fill_in "Name", with: FFaker::Product.brand
+      fill_in "Expires at", with: 5.days.from_now
+      expect {click_on "Add Personal Access Token"}.to change { PersonalAccessToken.count }.by(1)
+
+      active_personal_access_tokens = find(".table.active-personal-access-tokens").native.inner_html
+      expect(active_personal_access_tokens).to match(PersonalAccessToken.last.name)
+      expect(active_personal_access_tokens).to match(5.days.from_now.to_date.to_s)
+      expect(active_personal_access_tokens).to match(PersonalAccessToken.last.token)
+    end
+  end
+
+  describe "inactive tokens" do
+    it "allows revocation of an active token" do
+      personal_access_token = create(:personal_access_token, user: user)
+      visit profile_personal_access_tokens_path
+      click_on "Revoke"
+
+      inactive_personal_access_tokens = find(".table.inactive-personal-access-tokens").native.inner_html
+      expect(inactive_personal_access_tokens).to match(personal_access_token.name)
+      expect(inactive_personal_access_tokens).to match(personal_access_token.token)
+    end
+
+    it "moves expired tokens to the 'inactive' section" do
+      personal_access_token = create(:personal_access_token, expires_at: 5.days.ago, user: user)
+      visit profile_personal_access_tokens_path
+
+      inactive_personal_access_tokens = find(".table.inactive-personal-access-tokens").native.inner_html
+      expect(inactive_personal_access_tokens).to match(personal_access_token.name)
+      expect(inactive_personal_access_tokens).to match(personal_access_token.token)
+    end
+  end
+end