diff --git a/test/functional/uploads_controller_test.rb b/test/functional/uploads_controller_test.rb
index d638c3ff2..c602b283c 100644
--- a/test/functional/uploads_controller_test.rb
+++ b/test/functional/uploads_controller_test.rb
@@ -549,8 +549,8 @@ class UploadsControllerTest < ActionDispatch::IntegrationTest
         should_upload_successfully("https://nijie.info/view_popup.php?id=213043")
         should_upload_successfully("https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg")
 
-        should_upload_successfully("https://pawoo.net/web/statuses/1202176") if Danbooru.config.pawoo_client_id.present? # XXX
-        should_upload_successfully("https://img.pawoo.net/media_attachments/files/000/128/953/original/4c0a06087b03343f.png") if Danbooru.config.pawoo_client_id.present? # XXX
+        should_upload_successfully("https://pawoo.net/web/statuses/1202176") if Danbooru.config.pawoo_access_token.present? # XXX
+        should_upload_successfully("https://img.pawoo.net/media_attachments/files/000/128/953/original/4c0a06087b03343f.png") if Danbooru.config.pawoo_access_token.present? # XXX
 
         should_upload_successfully("https://baraag.net/@danbooru/107866090743238456")
         should_upload_successfully("https://baraag.net/system/media_attachments/files/107/866/084/749/942/932/original/a9e0f553e332f303.mp4")
diff --git a/test/unit/artist_test.rb b/test/unit/artist_test.rb
index 5f900ef43..f46a806c1 100644
--- a/test/unit/artist_test.rb
+++ b/test/unit/artist_test.rb
@@ -346,7 +346,7 @@ class ArtistTest < ActiveSupport::TestCase
 
     context "when finding pawoo artists" do
       setup do
-        skip "Pawoo keys not set" unless Danbooru.config.pawoo_client_id
+        skip "Pawoo keys not set" unless Danbooru.config.pawoo_access_token
         FactoryBot.create(:artist, :name => "evazion", :url_string => "https://pawoo.net/@evazion")
         FactoryBot.create(:artist, :name => "yasumo01", :url_string => "https://pawoo.net/web/accounts/28816")
       end
diff --git a/test/unit/downloads/pawoo_test.rb b/test/unit/downloads/pawoo_test.rb
deleted file mode 100644
index f3bb34371..000000000
--- a/test/unit/downloads/pawoo_test.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "test_helper"
-
-module Downloads
-  class PawooTest < ActiveSupport::TestCase
-    context "downloading a 'https://pawoo.net/web/statuses/:id' url" do
-      should "download the original file" do
-        skip "Pawoo keys not set" unless Danbooru.config.pawoo_client_id
-        @source = "https://pawoo.net/web/statuses/1202176"
-        @rewrite = "https://img.pawoo.net/media_attachments/files/000/128/953/original/4c0a06087b03343f.png"
-        assert_rewritten(@rewrite, @source)
-        assert_downloaded(7680, @source)
-      end
-    end
-
-    context "downloading a 'https://pawoo.net/:user/:id' url" do
-      should "download the original file" do
-        skip "Pawoo keys not set" unless Danbooru.config.pawoo_client_id
-        @source = "https://pawoo.net/@9ed00e924818/1202176"
-        @rewrite = "https://img.pawoo.net/media_attachments/files/000/128/953/original/4c0a06087b03343f.png"
-        assert_rewritten(@rewrite, @source)
-        assert_downloaded(7680, @source)
-      end
-    end
-
-    context "downloading a 'https://img.pawoo.net/media_attachments/:id/small/:file' url" do
-      should "download the original file" do
-        skip "Pawoo keys not set" unless Danbooru.config.pawoo_client_id
-        @source = "https://img.pawoo.net/media_attachments/files/000/128/953/small/4c0a06087b03343f.png"
-        @rewrite = "https://img.pawoo.net/media_attachments/files/000/128/953/original/4c0a06087b03343f.png"
-        assert_rewritten(@rewrite, @source)
-        assert_downloaded(7680, @source)
-      end
-    end
-  end
-end
diff --git a/test/unit/sources/mastodon_test.rb b/test/unit/sources/mastodon_test.rb
index c963e02d0..38ffece60 100644
--- a/test/unit/sources/mastodon_test.rb
+++ b/test/unit/sources/mastodon_test.rb
@@ -4,7 +4,7 @@ module Sources
   class MastodonTest < ActiveSupport::TestCase
     context "For Pawoo," do
       setup do
-        skip "Pawoo keys not set" unless Danbooru.config.pawoo_client_id
+        skip "Pawoo keys not set" unless Danbooru.config.pawoo_access_token
       end
 
       context "a https://pawoo.net/web/status/$id url" do
@@ -14,7 +14,8 @@ module Sources
           profile_url: "https://pawoo.net/@9ed00e924818",
           tag_name: "9ed00e924818",
           artist_name: nil,
-          dtext_artist_commentary_desc: "a mind forever voyaging through strange seas of thought alone"
+          dtext_artist_commentary_desc: "a mind forever voyaging through strange seas of thought alone",
+          download_size: 7_680,
         )
       end
 
@@ -67,7 +68,7 @@ module Sources
 
     context "For Baraag," do
       setup do
-        skip "Baraag keys not set" unless Danbooru.config.baraag_client_id
+        skip "Baraag keys not set" unless Danbooru.config.baraag_access_token
       end
 
       context "a baraag.net/$user/$id url" do