diff --git a/test/unit/related_tag_calculator_test.rb b/test/unit/related_tag_calculator_test.rb
index c545561fd..c40d11b7a 100644
--- a/test/unit/related_tag_calculator_test.rb
+++ b/test/unit/related_tag_calculator_test.rb
@@ -7,7 +7,7 @@ class RelatedTagCalculatorTest < ActiveSupport::TestCase
   end
 
   def similar_tags_for_search(tag_search, user = CurrentUser.user, **options)
-    post_query = PostQueryBuilder.new(tag_search, user)
+    post_query = PostQueryBuilder.new(tag_search, user).normalized_query
     RelatedTagCalculator.similar_tags_for_search(post_query, **options).pluck(:name)
   end
 
diff --git a/test/unit/tag_alias_test.rb b/test/unit/tag_alias_test.rb
index e5d3025db..1cb8f71dd 100644
--- a/test/unit/tag_alias_test.rb
+++ b/test/unit/tag_alias_test.rb
@@ -68,13 +68,6 @@ class TagAliasTest < ActiveSupport::TestCase
     end
 
     context "on secondary validation" do
-      should "warn about missing wiki pages" do
-        ti = FactoryBot.build(:tag_alias, antecedent_name: "aaa", consequent_name: "bbb", skip_secondary_validations: false)
-
-        assert(ti.invalid?)
-        assert_includes(ti.errors[:base], "The bbb tag needs a corresponding wiki page")
-      end
-
       should "warn about conflicting wiki pages" do
         FactoryBot.create(:wiki_page, title: "aaa", body: "aaa")
         FactoryBot.create(:wiki_page, title: "bbb", body: "bbb")
diff --git a/test/unit/upload_service_test.rb b/test/unit/upload_service_test.rb
index 79dd9a2d7..7761bfe9a 100644
--- a/test/unit/upload_service_test.rb
+++ b/test/unit/upload_service_test.rb
@@ -118,10 +118,10 @@ class UploadServiceTest < ActiveSupport::TestCase
           assert_operator(File.size(preview.path), :>, 0)
           assert_operator(File.size(crop.path), :>, 0)
           assert_operator(File.size(sample.path), :>, 0)
-          assert_equal(60, ImageSpec.new(preview.path).width)
-          assert_equal(60, ImageSpec.new(preview.path).height)
-          assert_equal(150, ImageSpec.new(crop.path).width)
-          assert_equal(150, ImageSpec.new(crop.path).height)
+          assert_equal(60, MediaFile.open(preview).width)
+          assert_equal(60, MediaFile.open(preview).height)
+          assert_equal(150, MediaFile.open(crop).width)
+          assert_equal(150, MediaFile.open(crop).height)
           preview.close
           preview.unlink
           sample.close
@@ -146,10 +146,10 @@ class UploadServiceTest < ActiveSupport::TestCase
             preview, crop, sample = subject.generate_resizes(@file, @upload)
             assert_operator(File.size(preview.path), :>, 0)
             assert_operator(File.size(crop.path), :>, 0)
-            assert_equal(150, ImageSpec.new(preview.path).width)
-            assert_equal(150, ImageSpec.new(preview.path).height)
-            assert_equal(150, ImageSpec.new(crop.path).width)
-            assert_equal(150, ImageSpec.new(crop.path).height)
+            assert_equal(150, MediaFile.open(preview).width)
+            assert_equal(150, MediaFile.open(preview).height)
+            assert_equal(150, MediaFile.open(crop).width)
+            assert_equal(150, MediaFile.open(crop).height)
             preview.close
             preview.unlink
             crop.close
@@ -169,10 +169,10 @@ class UploadServiceTest < ActiveSupport::TestCase
             preview, crop, sample = subject.generate_resizes(@file, @upload)
             assert_operator(File.size(preview.path), :>, 0)
             assert_operator(File.size(crop.path), :>, 0)
-            assert_equal(150, ImageSpec.new(preview.path).width)
-            assert_equal(150, ImageSpec.new(preview.path).height)
-            assert_equal(150, ImageSpec.new(crop.path).width)
-            assert_equal(150, ImageSpec.new(crop.path).height)
+            assert_equal(150, MediaFile.open(preview).width)
+            assert_equal(150, MediaFile.open(preview).height)
+            assert_equal(150, MediaFile.open(crop).width)
+            assert_equal(150, MediaFile.open(crop).height)
             preview.close
             preview.unlink
             crop.close