diff --git t/op/00ff-dos.t t/op/00ff-dos.t
index f20da54..f946781 100644
--- t/op/00ff-dos.t
+++ t/op/00ff-dos.t
@@ -1,13 +1,7 @@
-#!perl
-# Copyright (C) 2001-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 => 2;
-
 =head1 NAME
 
 t/op/00ff-dos.t - DOS File Format
@@ -22,19 +16,33 @@ Tests file formats.
 
 =cut
 
-my $code = qq(print "ok\\n"\r\nend\r\n);
-pasm_output_is( $code, <<'OUT', "fileformat dos" );
-ok
-OUT
-
-$code = qq(print "ok\\n"\r\nend\r\n\cZ\r\n);
-pasm_output_is( $code, <<'OUT', "fileformat dos w ctrl-z" );
-ok
-OUT
+.sub main :main
+    .include 'test_more.pir'
+    plan(2)
+
+    test_fileformat_dos()
+    test_fileformat_dos_ctrl_z()
+.end
+
+.sub test_fileformat_dos
+    lives_ok( <<'CODE', 'fileformat dos')
+.sub main
+    print "42\r\n"
+.end
+CODE
+.end
+
+.sub test_fileformat_dos_ctrl_z
+    lives_ok( <<'CODE', 'fileformat dos w ctrl-z')
+.sub main
+    print "42\r\n\cZ"
+.end
+CODE
+.end
 
 # Local Variables:
 #   mode: cperl
 #   cperl-indent-level: 4
 #   fill-column: 100
 # End:
-# vim: expandtab shiftwidth=4:
+# vim: expandtab shiftwidth=4 filetype=pir: