1 files changed, 7 insertions, 13 deletions
diff --git a/rt/t/shredder/01basics.t b/rt/t/shredder/01basics.t
index 1fa9f75..368c9ba 100644
--- a/rt/t/shredder/01basics.t
+++ b/rt/t/shredder/01basics.t
@@ -3,18 +3,10 @@ use strict;
 use warnings;
 
 use Test::Deep;
-use File::Spec;
-use Test::More tests => 3 + 1; # plus one for warnings check
-use RT::Test ();
-BEGIN {
-    my $shredder_utils = RT::Test::get_relocatable_file('utils.pl',
-        File::Spec->curdir());
-    require $shredder_utils;
-}
-init_db();
+use RT::Test::Shredder tests => 4;
+my $test = "RT::Test::Shredder";
 
-
-create_savepoint();
+$test->create_savepoint();
 
 use RT::Tickets;
 my $ticket = RT::Ticket->new( RT->SystemUser );
@@ -25,7 +17,9 @@ $ticket = RT::Ticket->new( RT->SystemUser );
 my ($status, $msg) = $ticket->Load( $id );
 ok( $id, "load ticket" ) or diag( "error: $msg" );
 
-my $shredder = shredder_new();
+my $shredder = $test->shredder_new();
 $shredder->Wipeout( Object => $ticket );
 
-cmp_deeply( dump_current_and_savepoint(), "current DB equal to savepoint");
+$test->db_is_valid;
+
+cmp_deeply( $test->dump_current_and_savepoint(), "current DB equal to savepoint");