diff --git a/lib/WebGUI/Mailing.pm b/lib/WebGUI/Mailing.pm
index 14a2f0a..2e8d604 100644
--- a/lib/WebGUI/Mailing.pm
+++ b/lib/WebGUI/Mailing.pm
@@ -106,6 +106,11 @@ sub deleteQueuedEmails {
     while ( my $email = $it->() ) {
         $email->delete;
     }
+    
+    $it = $self->getQueuedTestEmailIterator;
+    while ( my $email = $it->() ) {
+        $email->delete;
+    }
 
     return;
 }
@@ -144,6 +149,14 @@ sub getQueuedEmailIterator {
     return WebGUI::Mailing::Email->getQueued( $session, $self->getId );
 }
 
+#----------------------------------------------------------------------------
+sub getQueuedTestEmailIterator {
+    my $self    = shift;
+    my $session = $self->session;
+
+    return WebGUI::Mailing::Email->getQueuedTestEmails( $session, $self->getId );
+}
+
 #----------------------------------------------------------------------------
 sub getNextInSendQueue {
     my $class   = shift;