diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php
index b467d386f98c0aa23241112769f9f7c5fd52e442..57197e9999e5e21f634c84c569b35363cd05f3b2 100644
--- a/core/Controller/CssController.php
+++ b/core/Controller/CssController.php
@@ -95,7 +95,7 @@ class CssController extends Controller {
 		if ($encoding !== null && strpos($encoding, 'gzip') !== false) {
 			try {
 				$gzip = true;
-				return $folder->getFile($fileName . '.gz');
+				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
 			} catch (NotFoundException $e) {
 				// continue
 			}
diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php
index 0b50abc158ad39fa5e7567bbb2f2d7427c485dad..c7c9dea9101681b2e62c3ad964970fb1c90d8b60 100644
--- a/core/Controller/JsController.php
+++ b/core/Controller/JsController.php
@@ -96,7 +96,7 @@ class JsController extends Controller {
 		if ($encoding !== null && strpos($encoding, 'gzip') !== false) {
 			try {
 				$gzip = true;
-				return $folder->getFile($fileName . '.gz');
+				return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
 			} catch (NotFoundException $e) {
 				// continue
 			}
diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php
index 0f30fb915f7751e64b60cb448c36792eb657ce63..77c46a5e45e9526c7f653019b183311833be3df3 100644
--- a/lib/private/Template/JSCombiner.php
+++ b/lib/private/Template/JSCombiner.php
@@ -155,9 +155,9 @@ class JSCombiner {
 		}
 
 		try {
-			$gzipFile = $folder->getFile($fileName . '.gz');
+			$gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
 		} catch (NotFoundException $e) {
-			$gzipFile = $folder->newFile($fileName . '.gz');
+			$gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz
 		}
 
 		try {
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index df2e0232508861ede044c282a15411b905387ce2..6e09f41a215e5887bb484cc3555b873ba3d0888f 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -188,9 +188,9 @@ class SCSSCacher {
 
 		// Gzip file
 		try {
-			$gzipFile = $folder->getFile($fileNameCSS . '.gz');
+			$gzipFile = $folder->getFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
 		} catch (NotFoundException $e) {
-			$gzipFile = $folder->newFile($fileNameCSS . '.gz');
+			$gzipFile = $folder->newFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
 		}
 
 		try {
diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php
index 7fa358e056efa300362d6526eccb82ccfae4ca97..30bbc12809e9bd024966baa67dd91529f326855e 100644
--- a/tests/Core/Controller/CssControllerTest.php
+++ b/tests/Core/Controller/CssControllerTest.php
@@ -121,7 +121,7 @@ class CssControllerTest extends TestCase {
 			->willReturn($folder);
 
 		$folder->method('getFile')
-			->with('file.css.gz')
+			->with('file.css.gzip')
 			->willReturn($gzipFile);
 
 		$this->request->method('getHeader')
diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php
index 8f48a7c3390592a40960b266fc02a285ec9c7746..8456ba8b6e3890a1262750c064a2473beceecef8 100644
--- a/tests/Core/Controller/JsControllerTest.php
+++ b/tests/Core/Controller/JsControllerTest.php
@@ -120,7 +120,7 @@ class JsControllerTest extends TestCase {
 			->willReturn($folder);
 
 		$folder->method('getFile')
-			->with('file.js.gz')
+			->with('file.js.gzip')
 			->willReturn($gzipFile);
 
 		$this->request->method('getHeader')
diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/lib/Template/JSCombinerTest.php
index 1e6234a062c93d30ef9072d18127b83a4858990d..89bb13338c8293e916d1506847e674c86fd9aae3 100644
--- a/tests/lib/Template/JSCombinerTest.php
+++ b/tests/lib/Template/JSCombinerTest.php
@@ -111,7 +111,7 @@ class JSCombinerTest extends \Test\TestCase {
 					return $file;
 				} else if ($path === 'combine.js.deps') {
 					throw new NotFoundException();
-				} else if ($path === 'combine.js.gz') {
+				} else if ($path === 'combine.js.gzip') {
 					return $gzfile;
 				}
 				$this->fail();
@@ -148,7 +148,7 @@ class JSCombinerTest extends \Test\TestCase {
 					return $file;
 				} else if ($path === 'combine.js.deps') {
 					throw new NotFoundException();
-				} else if ($path === 'combine.js.gz') {
+				} else if ($path === 'combine.js.gzip') {
 					return $gzfile;
 				}
 				$this->fail();
@@ -302,7 +302,7 @@ class JSCombinerTest extends \Test\TestCase {
 					return $file;
 				} else if ($filename === 'combine.js.deps') {
 					return $depsFile;
-				} else if ($filename === 'combine.js.gz') {
+				} else if ($filename === 'combine.js.gzip') {
 					return $gzFile;
 				}
 				$this->fail();
@@ -333,7 +333,7 @@ class JSCombinerTest extends \Test\TestCase {
 					return $file;
 				} else if ($filename === 'combine.js.deps') {
 					return $depsFile;
-				} else if ($filename === 'combine.js.gz') {
+				} else if ($filename === 'combine.js.gzip') {
 					return $gzFile;
 				}
 				$this->fail();
@@ -401,7 +401,7 @@ var b = \'world\';
 					return $file;
 				} else if ($filename === 'combine.js.deps') {
 					return $depsFile;
-				} else if ($filename === 'combine.js.gz') {
+				} else if ($filename === 'combine.js.gzip') {
 					return $gzFile;
 				}
 				$this->fail();
diff --git a/tests/lib/Template/SCSSCacherTest.php b/tests/lib/Template/SCSSCacherTest.php
index 887fa1ed605a470e54bd6c7651a7ea8651c62258..24865b9ae458df7876f6cfba5b9bed490642ee5b 100644
--- a/tests/lib/Template/SCSSCacherTest.php
+++ b/tests/lib/Template/SCSSCacherTest.php
@@ -81,7 +81,7 @@ class SCSSCacherTest extends \Test\TestCase {
 					return $file;
 				} else if ($path === 'styles.css.deps') {
 					throw new NotFoundException();
-				} else if ($path === 'styles.css.gz') {
+				} else if ($path === 'styles.css.gzip') {
 					return $gzfile;
 				} else {
 					$this->fail();
@@ -110,7 +110,7 @@ class SCSSCacherTest extends \Test\TestCase {
 					return $file;
 				} else if ($path === 'styles.css.deps') {
 					throw new NotFoundException();
-				} else if ($path === 'styles.css.gz') {
+				} else if ($path === 'styles.css.gzip') {
 					return $gzfile;
 				}else {
 					$this->fail();
@@ -228,7 +228,7 @@ class SCSSCacherTest extends \Test\TestCase {
 				return $file;
 			} else if ($fileName === 'styles.css.deps') {
 				return $depsFile;
-			} else if ($fileName === 'styles.css.gz') {
+			} else if ($fileName === 'styles.css.gzip') {
 				return $gzipFile;
 			}
 			throw new \Exception();
@@ -258,7 +258,7 @@ class SCSSCacherTest extends \Test\TestCase {
 				return $file;
 			} else if ($fileName === 'styles.css.deps') {
 				return $depsFile;
-			} else if ($fileName === 'styles.css.gz') {
+			} else if ($fileName === 'styles.css.gzip') {
 				return $gzipFile;
 			}
 			throw new \Exception();
@@ -288,7 +288,7 @@ class SCSSCacherTest extends \Test\TestCase {
 				return $file;
 			} else if ($fileName === 'styles-success.css.deps') {
 				return $depsFile;
-			} else if ($fileName === 'styles-success.css.gz') {
+			} else if ($fileName === 'styles-success.css.gzip') {
 				return $gzipFile;
 			}
 			throw new \Exception();