diff --git a/ext/date/tests/DateTimeZone_getLocation.phpt b/ext/date/tests/DateTimeZone_getLocation.phpt
index 06d22820f1c..0d9a43f5e7a 100644
--- a/ext/date/tests/DateTimeZone_getLocation.phpt
+++ b/ext/date/tests/DateTimeZone_getLocation.phpt
@@ -1,20 +1,21 @@
 --TEST--
-DateTimeZone::getLocation -- timezone_location_get — Returns location information for a timezone public array DateTimeZone::getLocation ( void ) ;
+Test DateTimeZone::getLocation()
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --FILE--
 <?php
-$arrayDate = DateTimeZone::listAbbreviations();
 $countryCode = array("??");
 $countryCodeTest = array("AU", "CA", "ET", "AF", "US", "KZ", "AM");
 
-foreach($arrayDate as $value){
-
-    if(NULL != $value[0]['timezone_id']){
+foreach (DateTimeZone::listAbbreviations() as $value) {
+    if (NULL != $value[0]['timezone_id']) {
         $timeZone = new DateTimeZone($value[0]['timezone_id']);
         $timeZoneArray = $timeZone->getLocation();
+        if (false === $timeZoneArray) {
+            continue;
+        }
 
-        if((!in_array($timeZoneArray['country_code'], $countryCode)) && (NULL != $timeZoneArray['country_code']) && ("" != $timeZoneArray['country_code'])) {
+        if (!in_array($timeZoneArray['country_code'], $countryCode) && NULL != $timeZoneArray['country_code']) {
             array_push($countryCode, $timeZoneArray['country_code']);
 
             if(in_array($timeZoneArray['country_code'], $countryCodeTest)){
@@ -24,12 +25,6 @@ foreach($arrayDate as $value){
     }
 }
 ?>
---CLEAN--
-<?php
-unset($arrayDate);
-unset($countryCode);
-unset($countryCodeTest);
-?>
 --EXPECTF--
 Array
 (