diff --git a/spec/controllers/ajax/list_controller_spec.rb b/spec/controllers/ajax/list_controller_spec.rb
deleted file mode 100644
index 32cd3f38..00000000
--- a/spec/controllers/ajax/list_controller_spec.rb
+++ /dev/null
@@ -1,350 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-describe Ajax::ListController, :ajax_controller, type: :controller do
-  let(:target_user) { FactoryBot.create(:user) }
-
-  describe "#create" do
-    let(:name) { "I signori della gallassia" }
-    let(:target_user_param) { target_user.screen_name }
-    let(:params) do
-      {
-        "name" => name,
-        "user" => target_user_param
-      }
-    end
-
-    subject { post(:create, params: params) }
-
-    context "when user is signed in" do
-      let(:expected_response) do
-        {
-          "success" => true,
-          "status"  => "okay",
-          "message" => anything,
-          "render"  => anything
-        }
-      end
-
-      before(:each) { sign_in(user) }
-
-      it "creates the list" do
-        expect { subject }.to(change { user.lists.count }.by(1))
-      end
-
-      include_examples "returns the expected response"
-
-      context "when name param is missing" do
-        let(:name) { "" }
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status"  => "parameter_error",
-            "message" => anything
-          }
-        end
-
-        it "does not create the list" do
-          expect { subject }.not_to(change { user.lists.count })
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when target user does not exist" do
-        let(:target_user_param) { "giuseppe-drogo" }
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status"  => "not_found",
-            "message" => anything
-          }
-        end
-
-        it "does not create the list" do
-          expect { subject }.not_to(change { user.lists.count })
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when list name is invalid for reasons" do
-        let(:name) { "\u{1f43e}" }
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status"  => "err",
-            "message" => anything
-          }
-        end
-
-        it "does not create the list" do
-          expect { subject }.not_to(change { user.lists.count })
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when list already exists" do
-        before(:each) { post(:create, params: params) }
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status"  => "err",
-            "message" => anything
-          }
-        end
-
-        it "does not create the list" do
-          expect { subject }.not_to(change { user.lists.count })
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when someone else created a list with the same name" do
-        before(:each) do
-          FactoryBot.create(:list, user: target_user, display_name: name)
-        end
-
-        it "creates the list" do
-          expect { subject }.to(change { user.lists.count }.by(1))
-        end
-
-        include_examples "returns the expected response"
-      end
-    end
-
-    context "when user is not signed in" do
-      it_behaves_like "requires login"
-    end
-  end
-
-  describe "#destroy" do
-    let(:name) { "I signori della gallassia" }
-    let(:list) { FactoryBot.create(:list, user: user, display_name: name) }
-    let(:list_param) { list.name }
-    let(:params) do
-      {
-        "list" => list_param
-      }
-    end
-
-    subject { delete(:destroy, params: params) }
-
-    context "when user is signed in" do
-      let(:expected_response) do
-        {
-          "success" => true,
-          "status"  => "okay",
-          "message" => anything
-        }
-      end
-
-      before(:each) { sign_in(user) }
-
-      it "deletes the list" do
-        list
-        expect { subject }.to(change { user.lists.count }.by(-1))
-      end
-
-      include_examples "returns the expected response"
-
-      context "when list param is missing" do
-        let(:list_param) { "" }
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status"  => "parameter_error",
-            "message" => anything
-          }
-        end
-
-        it "does not delete the list" do
-          expect { subject }.not_to(change { user.lists.count })
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when list does not exist" do
-        let(:list_param) { "the-foobars-and-the-dingdongs" }
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status"  => "err",
-            "message" => anything
-          }
-        end
-
-        it "does not delete the list" do
-          expect { subject }.not_to(change { user.lists.count })
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when someone else created a list with the same name" do
-        before(:each) do
-          list
-          FactoryBot.create(:list, user: target_user, display_name: name)
-        end
-
-        it "deletes the list" do
-          expect { subject }.to(change { user.lists.count }.by(-1))
-        end
-
-        it "does not delete the other users' list" do
-          expect { subject }.not_to(change { target_user.lists.count })
-        end
-
-        include_examples "returns the expected response"
-      end
-    end
-
-    context "when user is not signed in" do
-      it_behaves_like "requires login"
-    end
-  end
-
-  describe "#membership" do
-    let(:name) { "The Agency" }
-    let(:members) { [] }
-    let(:list) { FactoryBot.create(:list, user: user, display_name: name, members: members) }
-    let(:list_param) { list.name }
-    let(:target_user_param) { target_user.screen_name }
-    let(:params) do
-      {
-        "list" => list_param,
-        "user" => target_user_param,
-        "add"  => add_param
-      }
-    end
-
-    subject { post(:membership, params: params) }
-
-    context "when user is signed in" do
-      let(:expected_response) do
-        {
-          "success" => true,
-          "status"  => "okay",
-          "message" => anything,
-          "checked" => expected_checked
-        }
-      end
-
-      before(:each) { sign_in(user) }
-
-      context "when add is false" do
-        let(:add_param) { "false" }
-        let(:expected_checked) { false }
-
-        it "does not do anything" do
-          expect { subject }.not_to(change { list.members })
-          expect(list.members.map { |gm| gm.user.id }.sort).to eq([])
-        end
-
-        include_examples "returns the expected response"
-
-        context "when the user was already added to the list" do
-          let(:members) { [target_user] }
-
-          it "removes the user from the list" do
-            expect { subject }.to(change { list.reload.members.map { |gm| gm.user.id }.sort }.from([target_user.id]).to([]))
-          end
-
-          include_examples "returns the expected response"
-        end
-      end
-
-      context "when add is true" do
-        let(:add_param) { "true" }
-        let(:expected_checked) { true }
-
-        it "adds the user to the list" do
-          expect { subject }.to(change { list.reload.members.map { |gm| gm.user.id }.sort }.from([]).to([target_user.id]))
-        end
-
-        include_examples "returns the expected response"
-
-        context "when the user was already added to the list" do
-          let(:members) { [target_user] }
-
-          it "does not add the user to the list again" do
-            expect { subject }.not_to(change { list.members })
-            expect(list.members.map { |gm| gm.user.id }.sort).to eq([target_user.id])
-          end
-
-          include_examples "returns the expected response"
-        end
-      end
-
-      context "when list does not exist" do
-        let(:list_param) { "the-good-agency" }
-        let(:add_param) { "add" }
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status"  => "not_found",
-            "message" => anything
-          }
-        end
-
-        include_examples "returns the expected response"
-      end
-
-      context "when target user does not exist" do
-        let(:target_user_param) { "erwin-proell" }
-        let(:add_param) { "add" }
-        let(:expected_response) do
-          {
-            "success" => false,
-            "status"  => "not_found",
-            "message" => anything
-          }
-        end
-
-        include_examples "returns the expected response"
-      end
-    end
-
-    context "when the target user is blocking the current user" do
-      let(:members) { [user] }
-      let(:add_param) { "add" }
-      let(:expected_response) do
-        {
-          "success" => false,
-          "status"  => "other_blocking_self",
-          "message" => anything
-        }
-      end
-
-      it "does not add the user to the list" do
-        expect { subject }.not_to(change { list.members })
-      end
-    end
-
-    context "when the user being added is blocking the current user" do
-      let(:members) { [user] }
-      let(:add_param) { "add" }
-      let(:expected_response) do
-        {
-          "success" => false,
-          "status"  => "self_blocking_other",
-          "message" => anything
-        }
-      end
-
-      it "does not add the user to the list" do
-        expect { subject }.not_to(change { list.members })
-      end
-    end
-
-    context "when user is not signed in" do
-      let(:add_param) { "whatever" }
-
-      it_behaves_like "requires login"
-    end
-  end
-end
diff --git a/spec/controllers/lists_controller_spec.rb b/spec/controllers/lists_controller_spec.rb
new file mode 100644
index 00000000..11c2b481
--- /dev/null
+++ b/spec/controllers/lists_controller_spec.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+describe ListsController, :ajax_controller, type: :controller do
+  let(:target_user) { FactoryBot.create(:user) }
+  let(:user) { FactoryBot.create(:user) }
+
+  describe "#create" do
+    let(:params) do
+      {
+        user: target_user.screen_name,
+        name: Faker::Lorem.sentence
+      }
+    end
+
+    subject { post(:create, params:) }
+
+    context "when user is signed in" do
+      before(:each) { sign_in(user) }
+
+      it "creates a new list" do
+        expect { subject }.to(change { List.count }.by(1))
+      end
+    end
+  end
+
+  describe "#destroy" do
+    let(:list) { FactoryBot.create(:list, user:) }
+    let(:params) do
+      {
+        list: list.id
+      }
+    end
+
+    subject { delete(:destroy, params:) }
+
+    context "when user is signed in" do
+      before(:each) { sign_in(user) }
+
+      context "when list exists" do
+        before(:each) { list }
+
+        it "removes the list" do
+          expect { subject }.to(change { List.count }.by(-1))
+        end
+      end
+    end
+  end
+
+  describe "#update" do
+    let(:list) { FactoryBot.create(:list, user:) }
+
+    subject { put(:update, params:) }
+
+    context "when user is signed in" do
+      before(:each) { sign_in(user) }
+
+      context "add user to list" do
+        let(:params) do
+          {
+            list: list.id,
+            user: target_user.screen_name,
+            add:  true
+          }
+        end
+
+        it "adds a list member to the list" do
+          expect { subject }.to(change { list.list_members.count }.by(1))
+        end
+      end
+
+      context "remove user from list" do
+        let(:params) do
+          {
+            list: list.id,
+            user: target_user.screen_name,
+            add:  false
+          }
+        end
+
+        before(:each) do
+          list.list_members.create(user: target_user)
+        end
+
+        it "removes a list member from the list" do
+          expect { subject }.to(change { list.list_members.count }.by(-1))
+        end
+      end
+    end
+  end
+end