diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 16032f465a..61395c987f 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -69,7 +69,7 @@ function current_time( $type, $gmt = 0 ) {
 		case 'timestamp':
 			return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
 		default:
-			return ( $gmt ) ? date( $type ) : date( $type, time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) );
+			return ( $gmt ) ? gmdate( $type ) : gmdate( $type, time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) );
 	}
 }
 
diff --git a/tests/phpunit/tests/date/currentTime.php b/tests/phpunit/tests/date/currentTime.php
new file mode 100644
index 0000000000..209eb128c6
--- /dev/null
+++ b/tests/phpunit/tests/date/currentTime.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @group date
+ * @group datetime
+ */
+class Tests_Date_CurrentTime extends WP_UnitTestCase {
+
+	public function test_should_work_with_changed_timezone() {
+
+		$format          = 'Y-m-d H:i:s';
+		$timezone_string = 'America/Regina';
+		update_option( 'timezone_string', $timezone_string );
+		$datetime = new DateTime( 'now', new DateTimeZone( $timezone_string ) );
+
+		date_default_timezone_set( $timezone_string );
+		$this->assertEquals( gmdate( $format ), current_time( $format, true ) );
+		$this->assertEquals( $datetime->format( $format ), current_time( $format ) );
+
+		date_default_timezone_set( 'UTC' );
+		$this->assertEquals( gmdate( $format ), current_time( $format, true ) );
+		$this->assertEquals( $datetime->format( $format ), current_time( $format ) );
+	}
+}