diff --git a/tests/all.js b/tests/all.js
index 090912d5d..4d8b914cd 100644
--- a/tests/all.js
+++ b/tests/all.js
@@ -3,10 +3,10 @@
 process.env.DEBUG = '*';
 require('./config');
 
-require('./classes/Serverless');
-require('./classes/PluginManager');
-require('./classes/Utils');
-require('./classes/Config');
+// require('./classes/Serverless');
+// require('./classes/PluginManager');
+// require('./classes/Utils');
+// require('./classes/Config');
 require('./classes/Service');
-require('./classes/YamlParser');
+// require('./classes/YamlParser');
 
diff --git a/tests/classes/Service.js b/tests/classes/Service.js
index 740c445c9..37801c1d4 100644
--- a/tests/classes/Service.js
+++ b/tests/classes/Service.js
@@ -163,17 +163,23 @@ describe('Service', () => {
       });
     });
 
-    it('should load and populate non string variables', () => {
-      return serviceInstance.load().then((loadedService) => {
+    it('should load and populate non string variables', () => serviceInstance.load()
+      .then((loadedService) => {
         expect(loadedService.custom.digit).to.be.equal(10);
-      });
-    });
+      })
+    );
 
-    it('should load and populate substring variables', () => {
-      return serviceInstance.load().then((loadedService) => {
+    it('should load and populate substring variables', () => serviceInstance.load()
+      .then((loadedService) => {
         expect(loadedService.custom.substring).to.be.equal('Hello World');
-      });
-    });
+      })
+    );
+
+    // it('should load and populate substring variables', () => {
+    //   return serviceInstance.load().then((loadedService) => {
+    //     expect(loadedService.custom.substring).to.be.equal('Hello World');
+    //   });
+    // });
 
     it('should load and populate with custom variable syntax', () => {
       serviceInstance.service = '${{testVar}}';