diff --git a/spec/lib/validators/selectable_avatars_enabled_validator_spec.rb b/spec/lib/validators/selectable_avatars_enabled_validator_spec.rb
deleted file mode 100644
index 034f58e4688..00000000000
--- a/spec/lib/validators/selectable_avatars_enabled_validator_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe SelectableAvatarsEnabledValidator do
-  describe '#valid_value?' do
-    subject(:validator) { described_class.new }
-
-    it "returns true when disabling" do
-      SiteSetting.selectable_avatars = ""
-      expect(validator.valid_value?("f")).to eq(true)
-
-      SiteSetting.selectable_avatars = [Fabricate(:image_upload), Fabricate(:image_upload)]
-      expect(validator.valid_value?("f")).to eq(true)
-    end
-
-    it "returns true when there are at least two selectable avatars" do
-      SiteSetting.selectable_avatars = [Fabricate(:image_upload), Fabricate(:image_upload)]
-      expect(validator.valid_value?("t")).to eq(true)
-    end
-
-    it "returns false when selectable avatars is blank or has one avatar" do
-      SiteSetting.selectable_avatars = ""
-      expect(validator.valid_value?("t")).to eq(false)
-
-      SiteSetting.selectable_avatars = [Fabricate(:image_upload)]
-      expect(validator.valid_value?("t")).to eq(false)
-    end
-  end
-end
diff --git a/spec/components/validators/selectable_avatars_mode_validator_spec.rb b/spec/lib/validators/selectable_avatars_mode_validator_spec.rb
similarity index 100%
rename from spec/components/validators/selectable_avatars_mode_validator_spec.rb
rename to spec/lib/validators/selectable_avatars_mode_validator_spec.rb