diff --git a/extras/src/test/java/edu/umd/cs/piccolox/pswing/PSwingCanvasTest.java b/extras/src/test/java/edu/umd/cs/piccolox/pswing/PSwingCanvasTest.java
index 44ee239..54b6824 100644
--- a/extras/src/test/java/edu/umd/cs/piccolox/pswing/PSwingCanvasTest.java
+++ b/extras/src/test/java/edu/umd/cs/piccolox/pswing/PSwingCanvasTest.java
@@ -7,6 +7,10 @@
 public class PSwingCanvasTest extends TestCase {
     protected int finalizerCallCount;
 
+    public void setUp() {
+    	finalizerCallCount = 0;
+    }
+    
     public void testMemoryLeak() throws InterruptedException {
         JPanel panel = new JPanel();
         for (int i = 0; i < 10; i++) {
@@ -22,6 +26,7 @@
         panel = null;
         System.gc();
         System.runFinalization();
+        Thread.sleep(10);
 
         // Not sure why I need -1 here, but I do. If I create 10000 it'll always
         // be 1 less