diff --git a/core/server/services/themes/Storage.js b/core/server/services/themes/Storage.js
index 2cb7c9578d1..b63bd02817e 100644
--- a/core/server/services/themes/Storage.js
+++ b/core/server/services/themes/Storage.js
@@ -6,7 +6,7 @@ var fs = require('fs-extra'),
     Promise = require('bluebird'),
     config = require('../../config'),
     security = require('../../lib/security'),
-    zipFolder = require('../../utils/zip-folder'),
+    localUtils = require('./utils'),
     LocalFileStorage = require('../../adapters/storage/LocalFileStorage');
 
 /**
@@ -37,7 +37,7 @@ class ThemeStorage extends LocalFileStorage {
 
             fs.ensureDir(zipBasePath)
                 .then(function () {
-                    return Promise.promisify(zipFolder)(themePath, zipPath);
+                    return Promise.promisify(localUtils.zipFolder)(themePath, zipPath);
                 })
                 .then(function (length) {
                     res.set({
diff --git a/core/server/utils/zip-folder.js b/core/server/services/themes/utils.js
similarity index 83%
rename from core/server/utils/zip-folder.js
rename to core/server/services/themes/utils.js
index b4eca7cf0fa..356ba2df981 100644
--- a/core/server/utils/zip-folder.js
+++ b/core/server/services/themes/utils.js
@@ -1,6 +1,8 @@
-var fs = require('fs-extra');
+'use strict';
 
-module.exports = function zipFolder(folderToZip, destination, callback) {
+const fs = require('fs-extra');
+
+exports.zipFolder = function zipFolder(folderToZip, destination, callback) {
     var archiver = require('archiver'),
         output = fs.createWriteStream(destination),
         archive = archiver.create('zip', {});
diff --git a/core/test/unit/utils/zip-folder_spec.js b/core/test/unit/services/themes/utils_spec.js
similarity index 62%
rename from core/test/unit/utils/zip-folder_spec.js
rename to core/test/unit/services/themes/utils_spec.js
index a676d66982a..5474bb448a0 100644
--- a/core/test/unit/utils/zip-folder_spec.js
+++ b/core/test/unit/services/themes/utils_spec.js
@@ -2,13 +2,13 @@ var should = require('should'), // jshint ignore:line
     path = require('path'),
     fs = require('fs-extra'),
     extract = require('extract-zip'),
-    zipFolder = require('../../../server/utils/zip-folder');
+    themeUtils = require('../../../../server/services/themes/utils');
 
-describe('Utils: zip-folder', function () {
-    const symlinkPath = path.join(__dirname, '..', '..', 'utils', 'fixtures', 'themes', 'theme-symlink'),
-        folderToSymlink = path.join(__dirname, '..', '..', 'utils', 'fixtures', 'themes', 'casper'),
-        zipDestination = path.join(__dirname, '..', '..', 'utils', 'fixtures', 'themes', 'theme-symlink.zip'),
-        unzipDestination = path.join(__dirname, '..', '..', 'utils', 'fixtures', 'themes', 'theme-symlink-unzipped');
+describe('services/themes: theme utils', function () {
+    const symlinkPath = path.join(__dirname, '..', '..', '..', 'utils', 'fixtures', 'themes', 'theme-symlink'),
+        folderToSymlink = path.join(__dirname, '..', '..', '..', 'utils', 'fixtures', 'themes', 'casper'),
+        zipDestination = path.join(__dirname, '..', '..', '..', 'utils', 'fixtures', 'themes', 'theme-symlink.zip'),
+        unzipDestination = path.join(__dirname, '..', '..', '..', 'utils', 'fixtures', 'themes', 'theme-symlink-unzipped');
 
     before(function () {
         fs.removeSync(symlinkPath);
@@ -25,7 +25,7 @@ describe('Utils: zip-folder', function () {
     it('ensure symlinks work', function (done) {
         fs.symlink(folderToSymlink, symlinkPath);
 
-        zipFolder(symlinkPath, zipDestination, function (err) {
+        themeUtils.zipFolder(symlinkPath, zipDestination, function (err) {
             if (err) {
                 return done(err);
             }