diff --git a/ext/admin/test.php b/ext/admin/test.php
index 271ef104..3f893899 100644
--- a/ext/admin/test.php
+++ b/ext/admin/test.php
@@ -1,6 +1,6 @@
 <?php
 class AdminPageTest extends ShimmiePHPUnitTestCase {
-	function testAuth() {
+	public function testAuth() {
 		$this->get_page('admin');
 		$this->assert_response(403);
 		$this->assert_title("Permission Denied");
@@ -16,7 +16,7 @@ class AdminPageTest extends ShimmiePHPUnitTestCase {
 		$this->assert_title("Admin Tools");
 	}
 
-	function testLowercase() {
+	public function testLowercase() {
 		$ts = time(); // we need a tag that hasn't been used before
 
 		$this->log_in_as_admin();
@@ -37,7 +37,7 @@ class AdminPageTest extends ShimmiePHPUnitTestCase {
 	}
 
 	# FIXME: make sure the admin tools actually work
-	function testRecount() {
+	public function testRecount() {
 		$this->log_in_as_admin();
 		$this->get_page('admin');
 		$this->assert_title("Admin Tools");
@@ -46,7 +46,7 @@ class AdminPageTest extends ShimmiePHPUnitTestCase {
 		send_event(new AdminActionEvent('recount_tag_use'));
 	}
 
-	function testDump() {
+	public function testDump() {
 		$this->log_in_as_admin();
 		$this->get_page('admin');
 		$this->assert_title("Admin Tools");
@@ -57,7 +57,7 @@ class AdminPageTest extends ShimmiePHPUnitTestCase {
 		//$this->assert_response(200);
 	}
 
-	function testDBQ() {
+	public function testDBQ() {
 		$this->log_in_as_user();
 		$image_id_1 = $this->post_image("tests/pbx_screenshot.jpg", "test");
 		$image_id_2 = $this->post_image("tests/bedroom_workshop.jpg", "test2");
diff --git a/ext/alias_editor/test.php b/ext/alias_editor/test.php
index 6c2a9514..0b8e4512 100644
--- a/ext/alias_editor/test.php
+++ b/ext/alias_editor/test.php
@@ -1,12 +1,12 @@
 <?php
 class AliasEditorTest extends ShimmiePHPUnitTestCase {
-	function testAliasList() {
+	public function testAliasList() {
 		$this->get_page('alias/list');
 		$this->assert_response(200);
 		$this->assert_title("Alias List");
 	}
 
-	function testAliasListReadOnly() {
+	public function testAliasListReadOnly() {
 		// Check that normal users can't add aliases.
 		$this->log_in_as_user();
 		$this->get_page('alias/list');
@@ -14,7 +14,7 @@ class AliasEditorTest extends ShimmiePHPUnitTestCase {
 		$this->assert_no_text("Add");
 	}
 
-	function testAliasEditor() {
+	public function testAliasEditor() {
 		/*
 		 **********************************************************************
 		 * FIXME: TODO:
diff --git a/ext/artists/test.php b/ext/artists/test.php
index 6f17ee9c..9cbfdf5e 100644
--- a/ext/artists/test.php
+++ b/ext/artists/test.php
@@ -1,6 +1,6 @@
 <?php
 class ArtistTest extends ShimmiePHPUnitTestCase {
-	function testSearch() {
+	public function testSearch() {
 		# FIXME: check that the results are there
 		$this->get_page("post/list/author=bob/1");
 		#$this->assert_response(200);
diff --git a/ext/ban_words/test.php b/ext/ban_words/test.php
index 80fb4bae..886aee18 100644
--- a/ext/ban_words/test.php
+++ b/ext/ban_words/test.php
@@ -1,6 +1,6 @@
 <?php
 class BanWordsTest extends ShimmiePHPUnitTestCase {
-	function check_blocked($image_id, $words) {
+	public function check_blocked($image_id, $words) {
 		global $user;
 		try {
 			send_event(new CommentPostingEvent($image_id, $user, $words));
@@ -11,7 +11,7 @@ class BanWordsTest extends ShimmiePHPUnitTestCase {
 		}
 	}
 
-	function testWordBan() {
+	public function testWordBan() {
 		global $config;
 		$config->set_string("banned_words", "viagra\nporn\n\n/http:.*\.cn\//");
 
diff --git a/ext/blocks/test.php b/ext/blocks/test.php
index 397418b5..e5681c4e 100644
--- a/ext/blocks/test.php
+++ b/ext/blocks/test.php
@@ -1,6 +1,6 @@
 <?php
 class BlocksTest extends ShimmiePHPUnitTestCase {
-	function testBlocks() {
+	public function testBlocks() {
 		$this->log_in_as_admin();
 		$this->get_page("blocks/list");
 		$this->assert_response(200);
diff --git a/ext/blotter/test.php b/ext/blotter/test.php
index aba22105..eafec499 100644
--- a/ext/blotter/test.php
+++ b/ext/blotter/test.php
@@ -1,13 +1,13 @@
 <?php
 class BlotterTest extends ShimmiePHPUnitTestCase {
-	function testLogin() {
+	public function testLogin() {
 		$this->log_in_as_admin();
 		//$this->assert_text("Blotter Editor");
 		//$this->click("Blotter Editor");
 		//$this->log_out();
 	}
 
-	function testDenial() {
+	public function testDenial() {
 		$this->get_page("blotter/editor");
 		$this->assert_response(403);
 		$this->get_page("blotter/add");
@@ -16,7 +16,7 @@ class BlotterTest extends ShimmiePHPUnitTestCase {
 		$this->assert_response(403);
 	}
 
-	function testAddViewRemove() {
+	public function testAddViewRemove() {
 		$this->log_in_as_admin();
 
 		$this->get_page("blotter/editor");
diff --git a/ext/bookmarks/test.php b/ext/bookmarks/test.php
index baac6697..02f99fec 100644
--- a/ext/bookmarks/test.php
+++ b/ext/bookmarks/test.php
@@ -1,6 +1,6 @@
 <?php
 class BookmarksTest extends ShimmiePHPUnitTestCase {
-	function testBookmarks() {
+	public function testBookmarks() {
 		$this->get_page("bookmark/add");
 		$this->get_page("bookmark/remove");
 	}
diff --git a/ext/browser_search/test.php b/ext/browser_search/test.php
index 129d2308..3d77f423 100644
--- a/ext/browser_search/test.php
+++ b/ext/browser_search/test.php
@@ -1,6 +1,6 @@
 <?php
 class BrowserSearchTest extends ShimmiePHPUnitTestCase {
-	function testBasic() {
+	public function testBasic() {
 		$this->get_page("browser_search/please_dont_use_this_tag_as_it_would_break_stuff__search.xml");
 		$this->get_page("browser_search/test");
 	}
diff --git a/ext/bulk_add/test.php b/ext/bulk_add/test.php
index 34382d6d..5ecb7de1 100644
--- a/ext/bulk_add/test.php
+++ b/ext/bulk_add/test.php
@@ -1,6 +1,6 @@
 <?php
 class BulkAddTest extends ShimmiePHPUnitTestCase {
-	function testBulkAdd() {
+	public function testBulkAdd() {
 		$this->log_in_as_admin();
 
 		$this->get_page('admin');
diff --git a/ext/comment/test.php b/ext/comment/test.php
index 01cbd3fc..93230a71 100644
--- a/ext/comment/test.php
+++ b/ext/comment/test.php
@@ -1,19 +1,19 @@
 <?php
 class CommentListTest extends ShimmiePHPUnitTestCase {
-	function setUp() {
+	public function setUp() {
 		global $config;
 		parent::setUp();
 		$config->set_int("comment_limit", 100);
 		$this->log_out();
 	}
 
-	function tearDown() {
+	public function tearDown() {
 		global $config;
 		$config->set_int("comment_limit", 10);
 		parent::tearDown();
 	}
 
-	function testCommentsPage() {
+	public function testCommentsPage() {
 		global $user;
 
 		$this->log_in_as_user();
@@ -85,7 +85,7 @@ class CommentListTest extends ShimmiePHPUnitTestCase {
 		$this->assert_no_text('ASDFASDF');
 	}
 
-	function testSingleDel() {
+	public function testSingleDel() {
 		$this->markTestIncomplete();
 
 		$this->log_in_as_admin();
diff --git a/ext/danbooru_api/test.php b/ext/danbooru_api/test.php
index bdb2d63b..6ea0fef7 100644
--- a/ext/danbooru_api/test.php
+++ b/ext/danbooru_api/test.php
@@ -1,6 +1,6 @@
 <?php
 class DanbooruApiTest extends ShimmiePHPUnitTestCase {
-	function testSearch() {
+	public function testSearch() {
 		$this->log_in_as_admin();
 
 		$image_id = $this->post_image("tests/bedroom_workshop.jpg", "data");
diff --git a/ext/downtime/test.php b/ext/downtime/test.php
index 561e0018..4331e27f 100644
--- a/ext/downtime/test.php
+++ b/ext/downtime/test.php
@@ -1,11 +1,11 @@
 <?php
 class DowntimeTest extends ShimmiePHPUnitTestCase {
-	function tearDown() {
+	public function tearDown() {
 		global $config;
 		$config->set_bool("downtime", false);
 	}
 
-	function testDowntime() {
+	public function testDowntime() {
 		global $config;
 
 		$config->set_string("downtime_message", "brb, unit testing");
diff --git a/ext/emoticons/test.php b/ext/emoticons/test.php
index ab1364e2..bc4a8af9 100644
--- a/ext/emoticons/test.php
+++ b/ext/emoticons/test.php
@@ -1,6 +1,6 @@
 <?php
 class EmoticonTest extends ShimmiePHPUnitTestCase {
-	function testEmoticons() {
+	public function testEmoticons() {
 		global $user;
 
 		$this->log_in_as_user();
diff --git a/ext/et/test.php b/ext/et/test.php
index 4e53a8bb..1d741eda 100644
--- a/ext/et/test.php
+++ b/ext/et/test.php
@@ -1,6 +1,6 @@
 <?php
 class ETTest extends ShimmiePHPUnitTestCase {
-	function testET() {
+	public function testET() {
 		$this->log_in_as_admin();
 		$this->get_page("system_info");
 		$this->assert_title("System Info");
diff --git a/ext/ext_manager/test.php b/ext/ext_manager/test.php
index 330df3cc..850abc27 100644
--- a/ext/ext_manager/test.php
+++ b/ext/ext_manager/test.php
@@ -1,6 +1,6 @@
 <?php
 class ExtManagerTest extends ShimmiePHPUnitTestCase {
-	function testAuth() {
+	public function testAuth() {
 		$this->get_page('ext_manager');
 		$this->assert_title("Extensions");
 
diff --git a/ext/favorites/test.php b/ext/favorites/test.php
index bd172711..cb6c09c7 100644
--- a/ext/favorites/test.php
+++ b/ext/favorites/test.php
@@ -1,6 +1,6 @@
 <?php
 class FavoritesTest extends ShimmiePHPUnitTestCase {
-	function testFavorites() {
+	public function testFavorites() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "test");
 
diff --git a/ext/featured/test.php b/ext/featured/test.php
index 4d93a5ba..74aa5678 100644
--- a/ext/featured/test.php
+++ b/ext/featured/test.php
@@ -1,6 +1,6 @@
 <?php
 class FeaturedTest extends ShimmiePHPUnitTestCase {
-	function testFeatured() {
+	public function testFeatured() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx");
 
diff --git a/ext/handle_404/test.php b/ext/handle_404/test.php
index ff84edac..2d7c9f73 100644
--- a/ext/handle_404/test.php
+++ b/ext/handle_404/test.php
@@ -1,6 +1,6 @@
 <?php
 class Handle404Test extends ShimmiePHPUnitTestCase {
-	function test404Handler() {
+	public function test404Handler() {
 		$this->get_page('not/a/page');
 		// most descriptive error first
 		$this->assert_text("No handler could be found for the page 'not/a/page'");
diff --git a/ext/handle_ico/test.php b/ext/handle_ico/test.php
index 06674539..b019eed0 100644
--- a/ext/handle_ico/test.php
+++ b/ext/handle_ico/test.php
@@ -1,6 +1,6 @@
 <?php
 class IcoHandlerTest extends ShimmiePHPUnitTestCase {
-	function testIcoHander() {
+	public function testIcoHander() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("lib/static/favicon.ico", "shimmie favicon");
 		$this->get_page("post/view/$image_id"); // test for no crash
diff --git a/ext/handle_pixel/test.php b/ext/handle_pixel/test.php
index db2f524f..0eed282a 100644
--- a/ext/handle_pixel/test.php
+++ b/ext/handle_pixel/test.php
@@ -1,6 +1,6 @@
 <?php
 class PixelHandlerTest extends ShimmiePHPUnitTestCase {
-	function testPixelHander() {
+	public function testPixelHander() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
 		//$this->assert_response(302);
diff --git a/ext/handle_svg/test.php b/ext/handle_svg/test.php
index 41501b1c..aaa2c350 100644
--- a/ext/handle_svg/test.php
+++ b/ext/handle_svg/test.php
@@ -1,6 +1,6 @@
 <?php
 class SVGHandlerTest extends ShimmiePHPUnitTestCase {
-	function testSVGHander() {
+	public function testSVGHander() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/test.svg", "something");
 		$this->get_page("post/view/$image_id"); // test for no crash
diff --git a/ext/home/test.php b/ext/home/test.php
index d6793e9d..3bf3c36d 100644
--- a/ext/home/test.php
+++ b/ext/home/test.php
@@ -1,6 +1,6 @@
 <?php
 class HomeTest extends ShimmiePHPUnitTestCase {
-	function testHomePage() {
+	public function testHomePage() {
 		$this->get_page('home');
 
 		// FIXME: this page doesn't use blocks; need assert_data_contains
diff --git a/ext/image_hash_ban/test.php b/ext/image_hash_ban/test.php
index 56c5dfc0..4e22fe71 100644
--- a/ext/image_hash_ban/test.php
+++ b/ext/image_hash_ban/test.php
@@ -1,6 +1,6 @@
 <?php
 class HashBanTest extends ShimmiePHPUnitTestCase {
-	function testBan() {
+	public function testBan() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx");
 		$this->log_out();
diff --git a/ext/index/test.php b/ext/index/test.php
index c6a196f9..a53cdc28 100644
--- a/ext/index/test.php
+++ b/ext/index/test.php
@@ -1,6 +1,6 @@
 <?php
 class IndexTest extends ShimmiePHPUnitTestCase {
-	function testIndexPage() {
+	public function testIndexPage() {
 		$this->get_page('post/list');
 		$this->assert_title("Welcome to Shimmie ".VERSION);
 		$this->assert_no_text("Prev | Index | Next");
@@ -29,7 +29,7 @@ class IndexTest extends ShimmiePHPUnitTestCase {
 		# FIXME: test search box
 	}
 
-	function testSearches() {
+	public function testSearches() {
 		$this->log_in_as_user();
 		$image_id_1 = $this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
 		$image_id_2 = $this->post_image("tests/bedroom_workshop.jpg", "computer bedroom workshop");
diff --git a/ext/ipban/test.php b/ext/ipban/test.php
index cd1887e5..ec0dfe0b 100644
--- a/ext/ipban/test.php
+++ b/ext/ipban/test.php
@@ -1,6 +1,6 @@
 <?php
 class IPBanTest extends ShimmiePHPUnitTestCase {
-	function testIPBan() {
+	public function testIPBan() {
 		$this->get_page('ip_ban/list');
 		$this->assert_response(403);
 		$this->assert_title("Permission Denied");
diff --git a/ext/link_image/test.php b/ext/link_image/test.php
index 0c890895..ca8e6f9b 100644
--- a/ext/link_image/test.php
+++ b/ext/link_image/test.php
@@ -1,6 +1,6 @@
 <?php
 class LinkImageTest extends ShimmiePHPUnitTestCase {
-	function testLinkImage() {
+	public function testLinkImage() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pie");
 
diff --git a/ext/log_db/test.php b/ext/log_db/test.php
index 3ab326fe..042a4640 100644
--- a/ext/log_db/test.php
+++ b/ext/log_db/test.php
@@ -1,6 +1,6 @@
 <?php
 class LogDatabaseTest extends ShimmiePHPUnitTestCase {
-	function testLog() {
+	public function testLog() {
 		$this->log_in_as_admin();
 		$this->get_page("log/view");
 		$this->get_page("log/view?module=core-image");
diff --git a/ext/numeric_score/test.php b/ext/numeric_score/test.php
index f2a9807b..f492acdb 100644
--- a/ext/numeric_score/test.php
+++ b/ext/numeric_score/test.php
@@ -1,6 +1,6 @@
 <?php
 class NumericScoreTest extends ShimmiePHPUnitTestCase {
-	function testNumericScore() {
+	public function testNumericScore() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx");
 		$this->get_page("post/view/$image_id");
diff --git a/ext/oekaki/test.php b/ext/oekaki/test.php
index 8c59d263..1061595c 100644
--- a/ext/oekaki/test.php
+++ b/ext/oekaki/test.php
@@ -1,6 +1,6 @@
 <?php
 class OekakiTest extends ShimmiePHPUnitTestCase {
-	function testLog() {
+	public function testLog() {
 		$this->log_in_as_user();
 		$this->get_page("oekaki/create");
 	}
diff --git a/ext/pm/test.php b/ext/pm/test.php
index 20aab33b..df065139 100644
--- a/ext/pm/test.php
+++ b/ext/pm/test.php
@@ -1,6 +1,6 @@
 <?php
 class PrivMsgTest extends ShimmiePHPUnitTestCase {
-	function testPM() {
+	public function testPM() {
 		$this->log_in_as_admin();
 		$this->get_page("user/test");
 
@@ -31,7 +31,7 @@ class PrivMsgTest extends ShimmiePHPUnitTestCase {
 		$this->log_out();
 	}
 
-	function testAdminAccess() {
+	public function testAdminAccess() {
 		$this->log_in_as_admin();
 		$this->get_page("user/test");
 
diff --git a/ext/pools/test.php b/ext/pools/test.php
index 81e9d63c..0a3cc265 100644
--- a/ext/pools/test.php
+++ b/ext/pools/test.php
@@ -1,6 +1,6 @@
 <?php
 class PoolsTest extends ShimmiePHPUnitTestCase {
-	function testPools() {
+	public function testPools() {
 		$this->get_page('pool/list');
 		$this->assert_title("Pools");
 
diff --git a/ext/random_image/test.php b/ext/random_image/test.php
index 0af4e906..ca4031c3 100644
--- a/ext/random_image/test.php
+++ b/ext/random_image/test.php
@@ -1,6 +1,6 @@
 <?php
 class RandomTest extends ShimmiePHPUnitTestCase {
-	function testRandom() {
+	public function testRandom() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "test");
 		$this->log_out();
@@ -15,7 +15,7 @@ class RandomTest extends ShimmiePHPUnitTestCase {
 		# FIXME: assert($raw == file(blah.jpg))
 	}
 
-	function testPostListBlock() {
+	public function testPostListBlock() {
 		$this->log_in_as_admin();
 		$this->get_page("setup");
 
diff --git a/ext/rating/test.php b/ext/rating/test.php
index 6a0ac913..87d5e1f3 100644
--- a/ext/rating/test.php
+++ b/ext/rating/test.php
@@ -1,6 +1,6 @@
 <?php
 class RatingTest extends ShimmiePHPUnitTestCase {
-	function testRating() {
+	public function testRating() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx");
 
diff --git a/ext/regen_thumb/test.php b/ext/regen_thumb/test.php
index 8e8f47b8..7deb66df 100644
--- a/ext/regen_thumb/test.php
+++ b/ext/regen_thumb/test.php
@@ -1,6 +1,6 @@
 <?php
 class RegenThumbTest extends ShimmiePHPUnitTestCase {
-	function testRegenThumb() {
+	public function testRegenThumb() {
 		$this->log_in_as_admin();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
 		$this->get_page("post/view/$image_id");
diff --git a/ext/report_image/test.php b/ext/report_image/test.php
index 8edbf66f..3af10913 100644
--- a/ext/report_image/test.php
+++ b/ext/report_image/test.php
@@ -1,6 +1,6 @@
 <?php
 class ReportImageTest extends ShimmiePHPUnitTestCase {
-	function testReportImage() {
+	public function testReportImage() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
 		$this->get_page("post/view/$image_id");
diff --git a/ext/res_limit/test.php b/ext/res_limit/test.php
index 0ed418c9..50260a8b 100644
--- a/ext/res_limit/test.php
+++ b/ext/res_limit/test.php
@@ -1,6 +1,6 @@
 <?php
 class ResLimitTest extends ShimmiePHPUnitTestCase {
-	function testResLimitOK() {
+	public function testResLimitOK() {
 		global $config;
 		$config->set_int("upload_min_height", 0);
 		$config->set_int("upload_min_width", 0);
@@ -16,7 +16,7 @@ class ResLimitTest extends ShimmiePHPUnitTestCase {
 		$this->assert_no_text("ratio");
 	}
 
-	function testResLimitSmall() {
+	public function testResLimitSmall() {
 		global $config;
 		$config->set_int("upload_min_height", 900);
 		$config->set_int("upload_min_width", 900);
@@ -33,7 +33,7 @@ class ResLimitTest extends ShimmiePHPUnitTestCase {
 		}
 	}
 
-	function testResLimitLarge() {
+	public function testResLimitLarge() {
 		global $config;
 		$config->set_int("upload_min_height", 0);
 		$config->set_int("upload_min_width", 0);
@@ -50,7 +50,7 @@ class ResLimitTest extends ShimmiePHPUnitTestCase {
 
 	}
 
-	function testResLimitRatio() {
+	public function testResLimitRatio() {
 		global $config;
 		$config->set_int("upload_min_height", -1);
 		$config->set_int("upload_min_width", -1);
diff --git a/ext/setup/test.php b/ext/setup/test.php
index 5af8fca9..2989472d 100644
--- a/ext/setup/test.php
+++ b/ext/setup/test.php
@@ -1,6 +1,6 @@
 <?php
 class SetupTest extends ShimmiePHPUnitTestCase {
-	function testNiceUrlsTest() {
+	public function testNiceUrlsTest() {
 		# XXX: this only checks that the text is "ok", to check
 		# for a bug where it was coming out as "\nok"; it doesn't
 		# check that niceurls actually work
@@ -9,27 +9,27 @@ class SetupTest extends ShimmiePHPUnitTestCase {
 		$this->assert_no_content("\n");
 	}
 
-	function testAuthAnon() {
+	public function testAuthAnon() {
 		$this->get_page('setup');
 		$this->assert_response(403);
 		$this->assert_title("Permission Denied");
 	}
 
-	function testAuthUser() {
+	public function testAuthUser() {
 		$this->log_in_as_user();
 		$this->get_page('setup');
 		$this->assert_response(403);
 		$this->assert_title("Permission Denied");
 	}
 
-	function testAuthAdmin() {
+	public function testAuthAdmin() {
 		$this->log_in_as_admin();
 		$this->get_page('setup');
 		$this->assert_title("Shimmie Setup");
 		$this->assert_text("General");
 	}
 
-	function testAdvanced() {
+	public function testAdvanced() {
 		$this->log_in_as_admin();
 		$this->get_page('setup/advanced');
 		$this->assert_title("Shimmie Setup");
diff --git a/ext/shimmie_api/test.php b/ext/shimmie_api/test.php
index 4d4e210b..99327dba 100644
--- a/ext/shimmie_api/test.php
+++ b/ext/shimmie_api/test.php
@@ -1,6 +1,6 @@
 <?php
 class ShimmieApiTest extends ShimmiePHPUnitTestCase {
-	function testAPI() {
+	public function testAPI() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx");
 
diff --git a/ext/site_description/test.php b/ext/site_description/test.php
index 4309a3ac..0ebd3d68 100644
--- a/ext/site_description/test.php
+++ b/ext/site_description/test.php
@@ -1,6 +1,6 @@
 <?php
 class SiteDescriptionTest extends ShimmiePHPUnitTestCase {
-	function testSiteDescription() {
+	public function testSiteDescription() {
 		global $config, $page;
 		$config->set_string("site_description", "A Shimmie testbed");
 		$this->get_page("post/list");
@@ -10,7 +10,7 @@ class SiteDescriptionTest extends ShimmiePHPUnitTestCase {
 		);
 	}
 
-	function testSiteKeywords() {
+	public function testSiteKeywords() {
 		global $config, $page;
 		$config->set_string("site_keywords", "foo,bar,baz");
 		$this->get_page("post/list");
diff --git a/ext/sitemap/test.php b/ext/sitemap/test.php
index f98ec4ae..a2756249 100644
--- a/ext/sitemap/test.php
+++ b/ext/sitemap/test.php
@@ -1,6 +1,6 @@
 <?php
 class XMLSitemapTest extends ShimmiePHPUnitTestCase {
-	function testBasic() {
+	public function testBasic() {
 		# this will implicitly check that there are no
 		# PHP-level error messages
 		$this->get_page('sitemap.xml');
diff --git a/ext/tag_edit/test.php b/ext/tag_edit/test.php
index 3abdc82e..498d29f4 100644
--- a/ext/tag_edit/test.php
+++ b/ext/tag_edit/test.php
@@ -1,6 +1,6 @@
 <?php
 class TagEditTest extends ShimmiePHPUnitTestCase {
-	function testTagEdit() {
+	public function testTagEdit() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx");
 		$this->get_page("post/view/$image_id");
@@ -21,7 +21,7 @@ class TagEditTest extends ShimmiePHPUnitTestCase {
 		$this->log_out();
 	}
 
-	function testSourceEdit() {
+	public function testSourceEdit() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx");
 		$this->get_page("post/view/$image_id");
@@ -51,7 +51,7 @@ class TagEditTest extends ShimmiePHPUnitTestCase {
 	/*
  	 * FIXME: Mass Tagger seems to be broken, and this test case always fails.
 	 */
-	function testMassEdit() {
+	public function testMassEdit() {
 		$this->markTestIncomplete();
 
 		$this->log_in_as_admin();
diff --git a/ext/tag_history/test.php b/ext/tag_history/test.php
index 3837fa07..4914be06 100644
--- a/ext/tag_history/test.php
+++ b/ext/tag_history/test.php
@@ -1,6 +1,6 @@
 <?php
 class TagHistoryTest extends ShimmiePHPUnitTestCase {
-	function testTagHistory() {
+	public function testTagHistory() {
 		$this->log_in_as_admin();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx");
 		$this->get_page("post/view/$image_id");
diff --git a/ext/tag_list/test.php b/ext/tag_list/test.php
index 4910f304..3d9b464f 100644
--- a/ext/tag_list/test.php
+++ b/ext/tag_list/test.php
@@ -2,7 +2,7 @@
 class TagListTest extends ShimmiePHPUnitTestCase {
 	var $pages = array("map", "alphabetic", "popularity", "categories");
 
-	function testTagList() {
+	public function testTagList() {
 		$this->get_page('tags/map');
 		$this->assert_title('Tag List');
 
@@ -18,7 +18,7 @@ class TagListTest extends ShimmiePHPUnitTestCase {
 		# FIXME: test that these show the right stuff
 	}
 
-	function testMinCount() {
+	public function testMinCount() {
 		foreach($this->pages as $page) {
 			$this->get_page("tags/$page?mincount=999999");
 			$this->assert_title("Tag List");
diff --git a/ext/tips/test.php b/ext/tips/test.php
index bc5015a9..e95fb5d8 100644
--- a/ext/tips/test.php
+++ b/ext/tips/test.php
@@ -1,6 +1,6 @@
 <?php
 class TipsTest extends ShimmiePHPUnitTestCase {
-	function setUp() {
+	public function setUp() {
 		parent::setUp();
 
 		$this->log_in_as_admin();
@@ -15,7 +15,7 @@ class TipsTest extends ShimmiePHPUnitTestCase {
 		$this->log_out();
 	}
 
-	function testImageless() {
+	public function testImageless() {
 		$this->log_in_as_admin();
 
 		$this->get_page("tips/list");
@@ -37,7 +37,7 @@ class TipsTest extends ShimmiePHPUnitTestCase {
 		$this->log_out();
 	}
 
-	function testImaged() {
+	public function testImaged() {
 		$this->log_in_as_admin();
 
 		$this->get_page("tips/list");
@@ -59,7 +59,7 @@ class TipsTest extends ShimmiePHPUnitTestCase {
 		$this->log_out();
 	}
 
-	function testDisabled() {
+	public function testDisabled() {
 		$this->log_in_as_admin();
 
 		$this->get_page("tips/list");
diff --git a/ext/upload/test.php b/ext/upload/test.php
index 1051c9bb..b1044202 100644
--- a/ext/upload/test.php
+++ b/ext/upload/test.php
@@ -1,18 +1,18 @@
 <?php
 class UploadTest extends ShimmiePHPUnitTestCase {
-	function testUploadPage() {
+	public function testUploadPage() {
 		$this->log_in_as_user();
 
 		$this->get_page("upload");
 		$this->assert_title("Upload");
 	}
 
-	function testUpload() {
+	public function testUpload() {
 		$this->log_in_as_user();
 		$this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
 	}
 
-	function testRejectDupe() {
+	public function testRejectDupe() {
 		$this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
 
 		try {
@@ -23,7 +23,7 @@ class UploadTest extends ShimmiePHPUnitTestCase {
 		}
 	}
 
-	function testRejectUnknownFiletype() {
+	public function testRejectUnknownFiletype() {
 		try {
 			$this->post_image("index.php", "test");
 		}
@@ -32,7 +32,7 @@ class UploadTest extends ShimmiePHPUnitTestCase {
 		}
 	}
 
-	function testRejectHuge() {
+	public function testRejectHuge() {
 		$this->markTestIncomplete();
 
 		// FIXME: huge.dat is rejected for other reasons; manual testing shows that this works
diff --git a/ext/user/test.php b/ext/user/test.php
index 8c777c67..6e72ebc3 100644
--- a/ext/user/test.php
+++ b/ext/user/test.php
@@ -1,6 +1,6 @@
 <?php
 class UserPageTest extends ShimmiePHPUnitTestCase {
-	function testUserPage() {
+	public function testUserPage() {
 		$this->get_page('user');
 		$this->assert_title("Not Logged In");
 		$this->assert_no_text("Options");
diff --git a/ext/view/test.php b/ext/view/test.php
index a467ea9f..d4ae305c 100644
--- a/ext/view/test.php
+++ b/ext/view/test.php
@@ -1,11 +1,11 @@
 <?php
 class ViewTest extends ShimmiePHPUnitTestCase {
-	function setUp() {
+	public function setUp() {
 		parent::setUp();
 		// FIXME: upload images
 	}
 
-	function testViewPage() {
+	public function testViewPage() {
 		$this->log_in_as_user();
 		$image_id_1 = $this->post_image("tests/pbx_screenshot.jpg", "test");
 		$image_id_2 = $this->post_image("tests/bedroom_workshop.jpg", "test2");
@@ -16,7 +16,7 @@ class ViewTest extends ShimmiePHPUnitTestCase {
 		$this->assert_title("Image $image_id_1: test");
 	}
 
-	function testPrevNext() {
+	public function testPrevNext() {
 		$this->markTestIncomplete();
 
 		$this->log_in_as_user();
diff --git a/ext/wiki/test.php b/ext/wiki/test.php
index 0a5c4699..8d6e9bb2 100644
--- a/ext/wiki/test.php
+++ b/ext/wiki/test.php
@@ -1,12 +1,12 @@
 <?php
 class WikiTest extends ShimmiePHPUnitTestCase {
-	function testIndex() {
+	public function testIndex() {
 		$this->get_page("wiki");
 		$this->assert_title("Index");
 		$this->assert_text("This is a default page");
 	}
 
-	function testAccess() {
+	public function testAccess() {
 		$this->markTestIncomplete();
 
 		global $config;
@@ -40,7 +40,7 @@ class WikiTest extends ShimmiePHPUnitTestCase {
 		}
 	}
 
-	function testLock() {
+	public function testLock() {
 		$this->markTestIncomplete();
 
 		global $config;
@@ -76,7 +76,7 @@ class WikiTest extends ShimmiePHPUnitTestCase {
 		$this->log_out();
 	}
 
-	function testDefault() {
+	public function testDefault() {
 		$this->markTestIncomplete();
 
 		$this->log_in_as_admin();
@@ -95,7 +95,7 @@ class WikiTest extends ShimmiePHPUnitTestCase {
 		$this->log_out();
 	}
 
-	function testRevisions() {
+	public function testRevisions() {
 		$this->markTestIncomplete();
 
 		$this->log_in_as_admin();
diff --git a/ext/word_filter/test.php b/ext/word_filter/test.php
index e08d4747..4ac1748d 100644
--- a/ext/word_filter/test.php
+++ b/ext/word_filter/test.php
@@ -1,12 +1,12 @@
 <?php
 class WordFilterTest extends ShimmiePHPUnitTestCase {
-	function setUp() {
+	public function setUp() {
 		global $config;
 		parent::setUp();
 		$config->set_string("word_filter", "whore,nice lady\na duck,a kitten\n white ,\tspace\ninvalid");
 	}
 
-	function _doThings($in, $out) {
+	public function _doThings($in, $out) {
 		global $user;
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
@@ -15,49 +15,49 @@ class WordFilterTest extends ShimmiePHPUnitTestCase {
 		$this->assert_text($out);
 	}
 
-	function testRegular() {
+	public function testRegular() {
 		$this->_doThings(
 			"posted by a whore",
 			"posted by a nice lady"
 		);
 	}
 
-	function testReplaceAll() {
+	public function testReplaceAll() {
 		$this->_doThings(
 			"a whore is a whore is a whore",
 			"a nice lady is a nice lady is a nice lady"
 		);
 	}
 
-	function testMixedCase() {
+	public function testMixedCase() {
 		$this->_doThings(
 			"monkey WhorE",
 			"monkey nice lady"
 		);
 	}
 
-	function testOnlyWholeWords() {
+	public function testOnlyWholeWords() {
 		$this->_doThings(
 			"my name is whoretta",
 			"my name is whoretta"
 		);
 	}
 
-	function testMultipleWords() {
+	public function testMultipleWords() {
 		$this->_doThings(
 			"I would like a duck",
 			"I would like a kitten"
 		);
 	}
 
-	function testWhitespace() {
+	public function testWhitespace() {
 		$this->_doThings(
 			"A colour is white",
 			"A colour is space"
 		);
 	}
 
-	function testIgnoreInvalid() {
+	public function testIgnoreInvalid() {
 		$this->_doThings(
 			"The word was invalid",
 			"The word was invalid"