Index: tests/org/apache/wiki/plugin/PageViewPluginTest.java
===================================================================
--- tests/org/apache/wiki/plugin/PageViewPluginTest.java	(revision 1402816)
+++ tests/org/apache/wiki/plugin/PageViewPluginTest.java	(working copy)
@@ -62,9 +62,15 @@
 
     public void testShowCountsBasic() throws Exception
     {
-        WikiPage page1 = testEngine.getPage( "TestPage01" );
+        // Lifecycle of PageViewPlugin spans all test cases, so page counts
+        // of pages used in other test cases will vary depending on when this 
+        // particular test case is called compared to the others.
+        // Pages below are not used by the other test case to avoid this problem.
+        testEngine.saveText( "TestCountPage01", "this is test count page 01 [{PageViewPlugin}]" );
+        testEngine.saveText( "TestCountPage02", "this is test count page 02 [{PageViewPlugin}]" );
+        WikiPage page1 = testEngine.getPage( "TestCountPage01" );
         WikiContext context1 = new WikiContext( testEngine, page1 );
-        WikiPage page2 = testEngine.getPage( "TestPage02" );
+        WikiPage page2 = testEngine.getPage( "TestCountPage02" );
         WikiContext context2 = new WikiContext( testEngine, page2 );
 
         // generate counts:
@@ -82,9 +88,11 @@
         String result = testEngine.getHTML( contextPV, pageviews );
 //        System.out.println( result );
 
-        assertTrue( result.contains( "Test Page 01 (2 views)" ) );
+        TestEngine.deleteTestPage( "TestCountPage01" );
+        TestEngine.deleteTestPage( "TestCountPage02" );
 
-        assertTrue( result.contains( "Test Page 02 (3 views)" ) );
+        assertTrue( result.contains( "Test Count Page 01 (2 views)" ) );
+        assertTrue( result.contains( "Test Count Page 02 (3 views)" ) );
     }
 
     public void testShowCountsExclude() throws Exception
@@ -111,12 +119,12 @@
         String result = testEngine.getHTML( contextPV, pageviews );
 //        System.out.println( result );
 
+        TestEngine.deleteTestPage( "TestPageExcluded" );
+
         assertTrue( result.contains( "Test Page 01" ) );
         
-        // this page should not have been shown:
+        // this page should not appear:
         assertFalse( result.contains( "Test Page Excluded" ) );
-
-        TestEngine.deleteTestPage( "TestPageExcluded" );
     }
 
     public void testShowCountsSorted() throws Exception
@@ -180,12 +188,11 @@
         String result = testEngine.getHTML( contextPV, pageviews );
 //        System.out.println( result );
 
+        TestEngine.deleteTestPage( "TestPage03" );
+        TestEngine.deleteTestPage( "TestPage04" );
+
         assertTrue( result.contains( "Test Page 03" ) );
-
         assertFalse( result.contains( "Test Page 04" ) );
-        
-        TestEngine.deleteTestPage( "TestPage03" );
-        TestEngine.deleteTestPage( "TestPage04" );
     }