diff --git a/xt/lib/My/Test/Class.pm b/xt/lib/My/Test/Class.pm
index 93df2920..b8dc227b 100644
--- a/xt/lib/My/Test/Class.pm
+++ b/xt/lib/My/Test/Class.pm
@@ -46,7 +46,7 @@ my $EMPTY = q{};
 
 sub startup : Tests( startup => 1 ) {
   my $test = shift;
-  (my $class = ref $test) =~ s/::Test$//x;
+  (my $class = ref $test) =~ s/^Test:://x;
   return ok 1, "$class loaded" if $class eq __PACKAGE__;
   use_ok $class or die;
   $test->class($class);
diff --git a/xt/lib/Test/SNMP/Info.pm b/xt/lib/Test/SNMP/Info.pm
index edd7da6b..09ab0089 100644
--- a/xt/lib/Test/SNMP/Info.pm
+++ b/xt/lib/Test/SNMP/Info.pm
@@ -27,7 +27,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-package SNMP::Info::Test;
+package Test::SNMP::Info;
 
 use Test::Class::Most parent => 'My::Test::Class';