diff --git a/tests/Remove-DbaDatabase.Tests.ps1 b/tests/Remove-DbaDatabase.Tests.ps1
index e023078bbe..d412ef4657 100644
--- a/tests/Remove-DbaDatabase.Tests.ps1
+++ b/tests/Remove-DbaDatabase.Tests.ps1
@@ -34,7 +34,7 @@ Describe "Remove-DbaDatabase" {
         It "Should not attempt to remove system databases" {
             foreach ($db in $dbs) {
                 $db1 = Get-DbaDatabase -SqlInstance $global:instance1 -Database $db
-                Remove-DbaDatabase -Confirm:$false -SqlInstance $global:instance1 -Database $db
+                { Remove-DbaDatabase -Confirm:$false -SqlInstance $global:instance1 -Database $db } | Should -Not -Throw
                 $db2 = Get-DbaDatabase -SqlInstance $global:instance1 -Database $db
                 $db2.Name | Should -Be $db1.Name
             }
@@ -43,7 +43,7 @@ Describe "Remove-DbaDatabase" {
         It "Should not take system databases offline or change their status" {
             foreach ($db in $dbs) {
                 $db1 = Get-DbaDatabase -SqlInstance $global:instance1 -Database $db
-                Remove-DbaDatabase -Confirm:$false -SqlInstance $global:instance1 -Database $db
+                { Remove-DbaDatabase -Confirm:$false -SqlInstance $global:instance1 -Database $db } | Should -Not -Throw
                 $db2 = Get-DbaDatabase -SqlInstance $global:instance1 -Database $db
                 $db2.Status | Should -Be $db1.Status
                 $db2.IsAccessible | Should -Be $db1.IsAccessible
@@ -52,13 +52,13 @@ Describe "Remove-DbaDatabase" {
     }
 
     Context "Should remove user databases and return useful errors if it cannot" {
-        It "Should remove a non system database" {
-            BeforeAll {
-                Remove-DbaDatabase -Confirm:$false -SqlInstance $global:instance1 -Database singlerestore
-                Get-DbaProcess -SqlInstance $global:instance1 -Database singlerestore | Stop-DbaProcess
-                Restore-DbaDatabase -SqlInstance $global:instance1 -Path $env:appveyorlabrepo\singlerestore\singlerestore.bak -WithReplace
-            }
+        BeforeAll {
+            Remove-DbaDatabase -Confirm:$false -SqlInstance $global:instance1 -Database singlerestore
+            Get-DbaProcess -SqlInstance $global:instance1 -Database singlerestore | Stop-DbaProcess
+            Restore-DbaDatabase -SqlInstance $global:instance1 -Path $env:appveyorlabrepo\singlerestore\singlerestore.bak -WithReplace
+        }
 
+        It "Should remove a non system database" {
             (Get-DbaDatabase -SqlInstance $global:instance1 -Database singlerestore).IsAccessible | Should -Be $true
             Remove-DbaDatabase -Confirm:$false -SqlInstance $global:instance1 -Database singlerestore
             Get-DbaDatabase -SqlInstance $global:instance1 -Database singlerestore | Should -BeNullOrEmpty
@@ -66,13 +66,13 @@ Describe "Remove-DbaDatabase" {
     }
 
     Context "Should remove restoring database and return useful errors if it cannot" {
-        It "Should remove a non system database" {
-            BeforeAll {
-                Remove-DbaDatabase -Confirm:$false -SqlInstance $global:instance1 -Database singlerestore
-                Get-DbaProcess -SqlInstance $global:instance1 -Database singlerestore | Stop-DbaProcess
-                Restore-DbaDatabase -SqlInstance $global:instance1 -Path $env:appveyorlabrepo\singlerestore\singlerestore.bak -WithReplace -NoRecovery
-            }
+        BeforeAll {
+            Remove-DbaDatabase -Confirm:$false -SqlInstance $global:instance1 -Database singlerestore
+            Get-DbaProcess -SqlInstance $global:instance1 -Database singlerestore | Stop-DbaProcess
+            Restore-DbaDatabase -SqlInstance $global:instance1 -Path $env:appveyorlabrepo\singlerestore\singlerestore.bak -WithReplace -NoRecovery
+        }
 
+        It "Should remove a non system database" {
             (Connect-DbaInstance -SqlInstance $global:instance1).Databases['singlerestore'].IsAccessible | Should -Be $false
             Remove-DbaDatabase -Confirm:$false -SqlInstance $global:instance1 -Database singlerestore
             Get-DbaDatabase -SqlInstance $global:instance1 -Database singlerestore | Should -BeNullOrEmpty