diff --git a/ext/image/test.php b/ext/image/test.php
index 2e5512a1..d5034175 100644
--- a/ext/image/test.php
+++ b/ext/image/test.php
@@ -1,5 +1,5 @@
 <?php
-class ImageTest extends ShimmiePHPUnitTestCase {
+class ImageIOTest extends ShimmiePHPUnitTestCase {
 	public function testUserStats() {
 		$this->log_in_as_user();
 		$image_id = $this->post_image("tests/pbx_screenshot.jpg", "test");
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 30b7859c..87f07f48 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -22,7 +22,10 @@ abstract class ShimmiePHPUnitTestCase extends PHPUnit_Framework_TestCase {
 
 	public function setUp() {
 		$class = str_replace("Test", "", get_class($this));
-		if(!method_exists($class, "is_live") || !ext_is_live($class)) {
+		if(!class_exists($class)) {
+			$this->markTestSkipped("$class not loaded");
+		}
+		elseif(!ext_is_live($class)) {
 			$this->markTestSkipped("$class not supported with this database");
 		}