diff --git a/api/unitframes.lua b/api/unitframes.lua
index 9c9112c6..0e588f5a 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -21,6 +21,7 @@ end
 -- slash command to toggle unitframe test mode
 pfUI.api.RegisterSlashCommand("PFTEST", { "/pftest", "/pfuftest" }, function()
   pfUI.uf.showall = not pfUI.uf.showall
+  if pfUI.uf.raid and pfUI.uf.raid.LayoutPets then pfUI.uf.raid:LayoutPets() end
 end, true)
 
 -- HoT buff indicators that need name verification because their icons are
diff --git a/modules/raid.lua b/modules/raid.lua
index e71d8cb0..1be1c174 100644
--- a/modules/raid.lua
+++ b/modules/raid.lua
@@ -131,6 +131,13 @@ pfUI:RegisterModule("raid", function ()
       pet:UpdateVisibility()
     end
 
+    if pfUI.uf.showall then
+      for id = 1, maxraid do
+        if self.pets[id] then place(self.pets[id], id, id) end
+      end
+      return
+    end
+
     if C.unitframes.raidpet.collapse == "1" then
       -- Pack the pets that exist into the leading cells, no gaps.
       local k = 0