diff --git t/dynpmc/foo2.t t/dynpmc/foo2.t
index 4a0dadf..8bd23a4 100644
--- t/dynpmc/foo2.t
+++ t/dynpmc/foo2.t
@@ -1,21 +1,14 @@
-#! perl
-# Copyright (C) 2005, Parrot Foundation.
+#! parrot
+# Copyright (C) 2001-2009, Parrot Foundation.
 # $Id$
 
-use strict;
-use warnings;
-use lib qw( . lib ../lib ../../lib );
-use Test::More;
-use Parrot::Test tests => 1;
-use Parrot::Config;
-
 =head1 NAME
 
-t/dynpmc/foo.t - Test for a very simple dynamic PMC
+t/dynpmc/foo2.t - Test for a very simple dynamic PMC
 
 =head1 SYNOPSIS
 
-        % prove t/dynpmc/foo.t
+        % prove t/dynpmc/foo2.t
 
 =head1 DESCRIPTION
 
@@ -23,22 +16,24 @@ Tests the Foo PMC.
 
 =cut
 
-pir_output_is( << 'CODE', << 'OUTPUT', "dynpmcs can use SUPER to call parent dynpmc VTABLE functions" );
-
 .sub main :main
+    .include 'test_more.pir'
+    plan(1)
+
+    test_dynpmcs_can_use_super()
+.end
+
+.sub test_dynpmcs_can_use_super 
     $P0 = loadlib 'foo_group'
     $P1 = new "Foo2"
 
     $I1 = $P1
-    say $I1
+    is($I1, 43, 'dynpmcs can use SUPER to call parent dynpmc VTABLE functions')
 .end
-CODE
-43
-OUTPUT
 
 # Local Variables:
 #   mode: cperl
 #   cperl-indent-level: 4
 #   fill-column: 100
 # End:
-# vim: expandtab shiftwidth=4:
+# vim: expandtab shiftwidth=4: filetype=pir: