diff --git t/op/time.t t/op/time.t
index 0547900..3a05b97 100644
--- t/op/time.t
+++ t/op/time.t
@@ -1,13 +1,7 @@
-#!perl
+#!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 => 7;
-
 =head1 NAME
 
 t/op/time.t - Time and Sleep
@@ -22,103 +16,111 @@ Tests the C<time> and C<sleep> operations.
 
 =cut
 
-pasm_output_is( <<'CODE', <<'OUTPUT', "time_i" );
-        time    I0
-        time    I1
-        ge      I0, 0, OK1
-        branch  FAIL
-OK1:    print "ok, (!= 1970) Grateful Dead not\n"
-        ge      I1, I0, OK2
-        branch FAIL
-OK2:    print "ok, (now>before) timelords need not apply\n"
-        branch  OK_ALL
-FAIL:   print "failure\n"
-        print "I0 was: "
-        print I0
-        print "\nI1 was: "
-        print I0
-        print "\n"
-OK_ALL:
-        end
-CODE
-ok, (!= 1970) Grateful Dead not
-ok, (now>before) timelords need not apply
-OUTPUT
-
-pasm_output_is( <<'CODE', <<'OUTPUT', "time_n" );
-        time    N0
-        time    N1
-        ge      N0, 0.0, OK1
-        branch  FAIL
-OK1:    print "ok, (!= 1970) Grateful Dead not\n"
-        ge      N1, N0, OK2
-        branch FAIL
-OK2:    print "ok, (now>before) timelords need not apply\n"
-        branch  OK_ALL
-FAIL:   print "failure\n"
-OK_ALL:
-        end
-CODE
-ok, (!= 1970) Grateful Dead not
-ok, (now>before) timelords need not apply
-OUTPUT
+.sub main :main
+    .include 'test_more.pir'
+    plan(10)
+
+    test_time_i_1()
+    test_time_i_2()
+    test_time_n_1()
+    test_time_n_2()
+    test_sleep_1()
+    test_sleep_2()
+    test_decodelocaltime()
+    test_gmtime_string_length()
+    test_time_float_vs_time_int()
+.end
+
+.sub test_time_i_1
+    time    $I0
+    time    $I1
+    ge      $I0, 0, OK
+    branch  FAIL
+  OK:
+    ok(1, "(!= 1970) Grateful Dead not")
+    .return()
+  FAIL:
+    ok(0, "failure: current time is 0 (and it is not 1970)")
+.end
+
+.sub test_time_i_2
+    time    $I0
+    time    $I1
+    ge      $I1, $I0, OK
+    branch FAIL
+  OK:
+    ok(1, "(now>before) timelords need not apply")
+    .return()
+  FAIL:
+    ok(0, "failure: now < before. wait, how is that possible?")
+.end
+
+.sub test_time_n_1
+    time    $N0
+    time    $N1
+    ge      $N0, 0.0, OK
+    branch  FAIL
+  OK:    
+    ok(1, "(!= 1970) Grateful Dead not")
+    .return()
+  FAIL:
+    ok(0, "failure: current time is 0 (and it is not 1970)")
+.end
+
+.sub test_time_n_2
+    time    $N0
+    time    $N1
+    ge      $N1, $N0, OK
+    branch FAIL
+  OK:
+    ok(1, "(now>before) timelords need not apply")
+    .return()
+  FAIL:
+    ok(0, "failure: now < before. wait, how is that possible?")
+.end
 
-pasm_output_is( <<CODE, <<OUTPUT, "sleep" );
-        print   "start\\n"
+.sub test_sleep_1
 
-        time    I1
+    time    $I1
 
-        sleep   1
-        set     I0, 1
-        sleep   I0
+    sleep   1
+    set     $I0, 1
+    sleep   $I0
 
-        time    I0
+    time    $I0
 
-        gt      I0, I1, ALLOK
-        print   "no, sleeping made time go the wrong way "
+    gt      $I0, $I1, ALLOK
+    ok(0, "no, sleeping made time go the wrong way")
 
 ALLOK:
-        print   "done\\n"
-        end
-CODE
-start
-done
-OUTPUT
+    ok(1, "sleep works")
+.end
 
-pasm_error_output_like( <<CODE, <<OUT , "sleep" );
-        sleep   -1
-        end
-CODE
-/Cannot go back in time/
-OUT
-
-my $year;
-( undef, undef, undef, undef, undef, $year ) = localtime();
-$year += 1900;
-
-# don't run this test 1 tick before the year changes #'
-
-pasm_output_is( <<'CODE', $year, "decodelocaltime" );
-    time I0
-    decodelocaltime P0, I0
-    .include "tm.pasm"
-    set I0, P0[.TM_YEAR]
-    print I0
-    end
+.sub test_sleep_2
+    dies_ok( <<'CODE', 'should not be able to go back in time')
+.sub main
+    sleep   -1
+.end
 CODE
+.end
 
-pir_output_is(<<'CODE', "Tue Jan  1 00:00:00 2008\n25", "gmtime string length");
-.sub _ :main
-$I0 = 1199145600
-$S0 = gmtime $I0
-print $S0
-$I1 = length $S0
-print $I1
+.sub test_decodelocaltime
+    $I0 = 1258153536
+    decodelocaltime $P0, $I0
+    .include 'tm.pasm'
+    set $I0, $P0[.TM_YEAR]
+    is($I0, 2009, 'decodelocaltime')
 .end
-CODE
 
-pir_output_is(<<'CODE', <<OUTPUT, "time(FLOATVAL) vs time(INTVAL)");
-.sub main :main
+.sub test_gmtime_string_length
+    $I0 = 1199145600
+    $S0 = gmtime $I0
+    is($S0, "Tue Jan  1 00:00:00 2008\n", 'gmtime string')
+    $I1 = length $S0
+    is($I1, 25, 'gmtime length')
+.end
+
+.sub test_time_float_vs_time_int
     .local int time_int
     time time_int
 
@@ -133,22 +135,16 @@ pir_output_is(<<'CODE', <<OUTPUT, "time(FLOATVAL) vs time(INTVAL)");
     time_int_upper = time_int + 5
     if time_float > time_int_upper goto FAIL
 
-    print "ok\n"
-    goto END
+    ok(1, "time_float is within [time_int - 5; time_int + 5]")
+    .return()
+  FAIL:
+    ok(0, "time_float is within [time_int - 5; time_int + 5]")
 
-FAIL: print "not ok\n"
-    goto END
-
-END:
 .end
-CODE
-ok
-OUTPUT
-
 
 # Local Variables:
 #   mode: cperl
 #   cperl-indent-level: 4
 #   fill-column: 100
 # End:
-# vim: expandtab shiftwidth=4:
+# vim: expandtab shiftwidth=4 filetype=pir: