diff --git a/test-suite/tests/statprof.test b/test-suite/tests/statprof.test
index 22fce3298..66af55f6b 100644
--- a/test-suite/tests/statprof.test
+++ b/test-suite/tests/statprof.test
@@ -1,5 +1,5 @@
 ;; guile-lib                    -*- scheme -*-
-;; Copyright (C) 2004, 2009 Andy Wingo <wingo at pobox dot com>
+;; Copyright (C) 2004, 2009, 2010 Andy Wingo <wingo at pobox dot com>
 ;; Copyright (C) 2001 Rob Browning <rlb at defaultvalue dot org>
 
 ;; This library is free software; you can redistribute it and/or
@@ -31,10 +31,6 @@
   #:use-module (srfi srfi-1)
   #:use-module (statprof))
 
-;; FIXME
-(debug-enable 'debug)
-(trap-enable 'traps)
-
 (pass-if "statistical sample counts within expected range"
   (let ()
     ;; test to see that if we call 3 identical functions equally, they
@@ -86,11 +82,10 @@
     ;; is active, it shows up N times.
     (let ((num-calls 200))
 
-      (define (do-nothing n)
-        (simple-format #f "FOO ~A\n" (+ n n)))
+      (define do-nothing
+        (compile '(lambda (n)
+                    (simple-format #f "FOO ~A\n" (+ n n)))))
     
-      (throw 'unresolved) ;; need to fix VM tracing.
-
       ;; Run test.
       (statprof-reset 0 50000 #t #f)
       (statprof-start)
@@ -102,8 +97,6 @@
           #t)))
       (statprof-stop)
     
-      ;;(statprof-display)
-
       ;; Check result.
       (let ((proc-data (statprof-proc-call-data do-nothing)))
         (and proc-data