diff --git a/Zend/tests/bug24884.phpt b/Zend/tests/bug24884.phpt
index ec216b2dac2..81bb3d6414f 100755
--- a/Zend/tests/bug24884.phpt
+++ b/Zend/tests/bug24884.phpt
@@ -24,5 +24,5 @@ $test2 = $test->__copy();
 var_dump($test2);
 ?>
 --EXPECT--
-object(test)#2 (0) {
+object(Test)#2 (0) {
 }
diff --git a/Zend/tests/bug26166.phpt b/Zend/tests/bug26166.phpt
index 46a8e3a614e..1c3934ac917 100755
--- a/Zend/tests/bug26166.phpt
+++ b/Zend/tests/bug26166.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #26166: __toString() crash when no values returned
+Bug #26166 (__toString() crash when no values returned)
 --FILE--
 <?php
 class Foo
@@ -64,4 +64,4 @@ Hello World!
 Got the exception
 ===NONE===
 
-Fatal error: Method none::__toString() must return a string value in %sbug26166.php on line %d
+Fatal error: Method None::__toString() must return a string value in %sbug26166.php on line %d
diff --git a/tests/classes/__set__get_001.phpt b/tests/classes/__set__get_001.phpt
index 3398fc5f817..beb688c2229 100644
--- a/tests/classes/__set__get_001.phpt
+++ b/tests/classes/__set__get_001.phpt
@@ -4,7 +4,7 @@ ZE2 __set() and __get()
 <?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2 needed'); ?>
 --FILE--
 <?php
-class Setter {
+class setter {
 	public $n;
 	public $x = array('a' => 1, 'b' => 2, 'c' => 3);
 
diff --git a/tests/classes/array_access_001.phpt b/tests/classes/array_access_001.phpt
index 08b741e1c8c..8a670c1c24e 100644
--- a/tests/classes/array_access_001.phpt
+++ b/tests/classes/array_access_001.phpt
@@ -6,7 +6,7 @@ ZE2 ArrayAccess
 ?>
 --FILE--
 <?php
-class Object implements ArrayAccess {
+class object implements ArrayAccess {
 
 	public $a = array('1st', 1, 2=>'3rd', '4th'=>4);
 
diff --git a/tests/classes/array_access_002.phpt b/tests/classes/array_access_002.phpt
index cb4416d7bdf..584227ee896 100644
--- a/tests/classes/array_access_002.phpt
+++ b/tests/classes/array_access_002.phpt
@@ -6,7 +6,7 @@ ZE2 ArrayAccess::offsetSet without return
 ?>
 --FILE--
 <?php
-class Object implements ArrayAccess {
+class object implements ArrayAccess {
 
 	public $a = array('1st', 1, 2=>'3rd', '4th'=>4);
 
diff --git a/tests/classes/array_access_003.phpt b/tests/classes/array_access_003.phpt
index 28e7e836ad1..538ca072763 100644
--- a/tests/classes/array_access_003.phpt
+++ b/tests/classes/array_access_003.phpt
@@ -6,7 +6,7 @@ ZE2 ArrayAccess::offsetGet ambiguties
 ?>
 --FILE--
 <?php
-class Object implements ArrayAccess {
+class object implements ArrayAccess {
 
 	public $a = array('1st', 1, 2=>'3rd', '4th'=>4);
 
diff --git a/tests/classes/array_access_004.phpt b/tests/classes/array_access_004.phpt
index 8032d286427..eec6c80d307 100644
--- a/tests/classes/array_access_004.phpt
+++ b/tests/classes/array_access_004.phpt
@@ -6,7 +6,7 @@ ZE2 ArrayAccess::offsetGet ambiguties
 ?>
 --FILE--
 <?php
-class Object implements ArrayAccess {
+class object implements ArrayAccess {
 
 	public $a = array('1st', 1, 2=>'3rd', '4th'=>4);
 
diff --git a/tests/classes/bug23951.phpt b/tests/classes/bug23951.phpt
index a49d62f3fe3..2e272b87fe9 100644
--- a/tests/classes/bug23951.phpt
+++ b/tests/classes/bug23951.phpt
@@ -27,7 +27,7 @@ print_r($b->b_var);
 
 ?>
 --EXPECT--
-a Object
+A Object
 (
     [a_var] => Array
         (
diff --git a/tests/classes/dereferencing_001.phpt b/tests/classes/dereferencing_001.phpt
index 202602f1466..dd2aba78e57 100644
--- a/tests/classes/dereferencing_001.phpt
+++ b/tests/classes/dereferencing_001.phpt
@@ -18,7 +18,7 @@ class Name {
 class Person {
 	private $name;
 
-	function Person($_name, $_address) {
+	function person($_name, $_address) {
 		$this->name = new Name($_name);
 	}
 
diff --git a/tests/classes/interfaces_002.phpt b/tests/classes/interfaces_002.phpt
index 7b3e2cf1134..66d46f5d360 100644
--- a/tests/classes/interfaces_002.phpt
+++ b/tests/classes/interfaces_002.phpt
@@ -25,5 +25,5 @@ echo $foo->getMessage() . "\n";
 ?>
 --EXPECTF--
 
-Fatal error: Class exception_foo contains 1 abstract methods and must therefore be declared abstract (throwable::getErrno) in %s on line %d
+Fatal error: Class Exception_foo contains 1 abstract methods and must therefore be declared abstract (Throwable::getErrno) in %s on line %d
 
diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt
index e6b97a58736..d4042a496d9 100644
--- a/tests/classes/type_hinting_001.phpt
+++ b/tests/classes/type_hinting_001.phpt
@@ -35,4 +35,4 @@ $a->b($b);
 ?>
 --EXPECTF--
 
-Fatal error: Argument 1 must implement interface foo in %s on line %d
+Fatal error: Argument 1 must implement interface Foo in %s on line %d
diff --git a/tests/lang/bug26182.phpt b/tests/lang/bug26182.phpt
index b37c7c23511..7417293928a 100644
--- a/tests/lang/bug26182.phpt
+++ b/tests/lang/bug26182.phpt
@@ -20,6 +20,6 @@ print_r($t);
 
 ?>
 --EXPECT--
-a Object
+A Object
 (
 )
diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt
index bd1577fe314..99b7fac0eb7 100644
--- a/tests/lang/type_hints_001.phpt
+++ b/tests/lang/type_hints_001.phpt
@@ -23,4 +23,4 @@ type_hint_foo($bar);
 ?>
 --EXPECTF--
 
-Fatal error: Argument 1 must be an instance of foo in %s on line %d
+Fatal error: Argument 1 must be an instance of Foo in %s on line %d
diff --git a/tests/run-test/test009.phpt b/tests/run-test/test009.phpt
index f6412cbda6c..650686f6901 100644
--- a/tests/run-test/test009.phpt
+++ b/tests/run-test/test009.phpt
@@ -7,6 +7,6 @@ $foo = new Foo;
 print_r($foo);
 ?>
 --EXPECTF--
-foo Object
+Foo Object
 (
 )