diff --git a/Zend/tests/declare_005.phpt b/Zend/tests/declare_005.phpt
index 8f5adcfbd2f..d1c716cebc3 100644
--- a/Zend/tests/declare_005.phpt
+++ b/Zend/tests/declare_005.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Testing declare statement with ticks
---SKIPIF--
 --FILE--
 <?php
 register_tick_function(function () { echo "tick\n"; });
diff --git a/ext/curl/tests/curl_file_upload.phpt b/ext/curl/tests/curl_file_upload.phpt
index c64e67aa5c7..8d304c5f016 100644
--- a/ext/curl/tests/curl_file_upload.phpt
+++ b/ext/curl/tests/curl_file_upload.phpt
@@ -1,6 +1,5 @@
 --TEST--
 CURL file uploading
---INI--
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 --FILE--
diff --git a/ext/curl/tests/curl_ftp_pasv.phpt b/ext/curl/tests/curl_ftp_pasv.phpt
index 6cd74291046..31d670ae0d8 100644
--- a/ext/curl/tests/curl_ftp_pasv.phpt
+++ b/ext/curl/tests/curl_ftp_pasv.phpt
@@ -1,8 +1,7 @@
 --TEST--
-Test curl_exec() function with basic functionality 
---CREDITS--
+Test curl_exec() function with basic functionality
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 if (false === getenv('PHP_CURL_FTP_REMOTE_SERVER'))  exit("skip PHP_CURL_FTP_REMOTE_SERVER env variable is not defined");
 if (false === getenv('PHP_CURL_FTP_REMOTE_USER'))  exit("skip PHP_CURL_FTP_REMOTE_USER env variable is not defined");
@@ -14,7 +13,7 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD'))  exit("skip PHP_CURL_FTP_REM
   $username = getenv('PHP_CURL_FTP_REMOTE_USER');
   $password = getenv('PHP_CURL_FTP_REMOTE_PASSWD');
 
-  // FTP this script to a server 
+  // FTP this script to a server
   $fp  =  fopen ( __FILE__ ,  "r" );
   $url  =  "ftp://$username:$password@$host/test.phpt" ;
 
diff --git a/ext/curl/tests/curl_multi_segfault.phpt b/ext/curl/tests/curl_multi_segfault.phpt
index dde81894116..fffe9f1fbb7 100644
--- a/ext/curl/tests/curl_multi_segfault.phpt
+++ b/ext/curl/tests/curl_multi_segfault.phpt
@@ -1,8 +1,7 @@
 --TEST--
-Segfault due to libcurl connection caching 
---CREDITS--
+Segfault due to libcurl connection caching
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 if (false === getenv('PHP_CURL_FTP_REMOTE_SERVER'))  exit("skip PHP_CURL_FTP_REMOTE_SERVER env variable is not defined");
 if (false === getenv('PHP_CURL_FTP_REMOTE_USER'))  exit("skip PHP_CURL_FTP_REMOTE_USER env variable is not defined");
@@ -14,7 +13,7 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD'))  exit("skip PHP_CURL_FTP_REM
   $username = getenv('PHP_CURL_FTP_REMOTE_USER');
   $password = getenv('PHP_CURL_FTP_REMOTE_PASSWD');
 
-  // FTP this script to a server 
+  // FTP this script to a server
   $fp  =  fopen ( __FILE__ ,  "r" );
   $url  =  "ftp://$username:$password@$host/" ;
 
@@ -43,8 +42,8 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD'))  exit("skip PHP_CURL_FTP_REM
 			  $mrc = curl_multi_exec($cmh, $active);
 		  } while ($mrc == CURLM_CALL_MULTI_PERFORM);
 	  }
-  }   
-    
+  }
+
   var_dump(is_string(curl_multi_getcontent($ch)));
   curl_multi_remove_handle($cmh, $ch);
   curl_close($ch);
diff --git a/ext/date/tests/bug55397.phpt b/ext/date/tests/bug55397.phpt
index 2ce12577101..98f29a25b53 100644
--- a/ext/date/tests/bug55397.phpt
+++ b/ext/date/tests/bug55397.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Bug #55397 (comparison of incomplete DateTime causes SIGSEGV)
---INI--
 --FILE--
 <?php
 date_default_timezone_set('Europe/Prague');
diff --git a/ext/pgsql/tests/09notice.phpt b/ext/pgsql/tests/09notice.phpt
index 64ab068e4a4..11c80481f6d 100644
--- a/ext/pgsql/tests/09notice.phpt
+++ b/ext/pgsql/tests/09notice.phpt
@@ -8,7 +8,6 @@ include("skipif.inc");
 _skip_lc_messages();
 
 ?>
---INI--
 --FILE--
 <?php
 include 'config.inc';
diff --git a/ext/session/tests/bug61470.phpt b/ext/session/tests/bug61470.phpt
index 93d79fb75ce..7f07929f2e7 100644
--- a/ext/session/tests/bug61470.phpt
+++ b/ext/session/tests/bug61470.phpt
@@ -2,7 +2,6 @@
 Bug #61470 (session_regenerate_id() does not create session file)
 --SKIPIF--
 <?php include('skipif.inc'); ?>
---INI--
 --FILE--
 <?php
 ob_start();
@@ -21,7 +20,7 @@ var_dump(is_file($file2));
 // cleanup
 @unlink($file1);
 @unlink($file2);
+?>
 --EXPECT--
 bool(true)
 bool(true)
-
diff --git a/ext/session/tests/bug66827.phpt b/ext/session/tests/bug66827.phpt
index 4e1a4f7aea6..09bfa203ef6 100644
--- a/ext/session/tests/bug66827.phpt
+++ b/ext/session/tests/bug66827.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Bug #66827: Session raises E_NOTICE when session name variable is array.
---INI--
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
@@ -8,5 +7,6 @@ Bug #66827: Session raises E_NOTICE when session name variable is array.
 $_COOKIE[session_name()] = array();
 session_start();
 echo 'OK';
+?>
 --EXPECTF--
 OK
diff --git a/ext/standard/tests/general_functions/intval_binary_prefix.phpt b/ext/standard/tests/general_functions/intval_binary_prefix.phpt
index af495153969..e5b82148814 100644
--- a/ext/standard/tests/general_functions/intval_binary_prefix.phpt
+++ b/ext/standard/tests/general_functions/intval_binary_prefix.phpt
@@ -1,6 +1,5 @@
 --TEST--
 Test intval() function with "0b" string prefix
---SKIPIF--
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/network/setcookie.phpt b/ext/standard/tests/network/setcookie.phpt
index 3582d341a78..167e65f0a73 100644
--- a/ext/standard/tests/network/setcookie.phpt
+++ b/ext/standard/tests/network/setcookie.phpt
@@ -1,6 +1,5 @@
 --TEST--
 setcookie() tests
---DESCRIPTION--
 --INI--
 date.timezone=UTC
 --FILE--
diff --git a/ext/zip/tests/001.phpt b/ext/zip/tests/001.phpt
index 37dccc055e0..3adaabbf329 100644
--- a/ext/zip/tests/001.phpt
+++ b/ext/zip/tests/001.phpt
@@ -2,10 +2,8 @@
 Check for zip presence
 --SKIPIF--
 <?php if (!extension_loaded("zip")) print "skip"; ?>
---POST--
---GET--
 --FILE--
-<?php 
+<?php
 echo "zip extension is available";
 ?>
 --EXPECT--
diff --git a/tests/basic/encoding.phpt b/tests/basic/encoding.phpt
index c513cbfa79a..dbf61db9bcd 100644
--- a/tests/basic/encoding.phpt
+++ b/tests/basic/encoding.phpt
@@ -1,6 +1,5 @@
 --TEST--
 PHP encoding setting test
---INI--
 --FILE--
 <?php
 var_dump(ini_get('default_charset'));
@@ -20,7 +19,7 @@ var_dump(ini_set('output_encoding', 'EUC-JP'));
 var_dump(ini_get('input_encoding'));
 var_dump(ini_get('internal_encoding'));
 var_dump(ini_get('output_encoding'));
-
+?>
 --EXPECT--
 string(5) "UTF-8"
 string(0) ""