diff --git a/test/api_spec.js b/test/integration/api/admin/api_spec.js
similarity index 99%
rename from test/api_spec.js
rename to test/integration/api/admin/api_spec.js
index fa91f939..f7e67b52 100644
--- a/test/api_spec.js
+++ b/test/integration/api/admin/api_spec.js
@@ -7,14 +7,14 @@ const sinon = require('sinon');
 const ClientRequest = require('_http_client').ClientRequest;
 const http = require('http');
 const Q = require('q');
-const cloudinary = require("../cloudinary");
-const helper = require("./spechelper");
-const wait = require('./testUtils/helpers/wait');
+const cloudinary = require("../../../../cloudinary");
+const helper = require("../../../spechelper");
+const wait = require('../../../testUtils/helpers/wait');
 const sharedExamples = helper.sharedExamples;
 const itBehavesLike = helper.itBehavesLike;
 const uploadImage = helper.uploadImage;
 
-const testConstants = require('./testUtils/testConstants');
+const testConstants = require('../../../testUtils/testConstants');
 const API_V2 = cloudinary.v2.api;
 
 const {
diff --git a/test/search_spec.js b/test/integration/api/search/search_spec.js
similarity index 97%
rename from test/search_spec.js
rename to test/integration/api/search/search_spec.js
index 9a61001d..21a33611 100644
--- a/test/search_spec.js
+++ b/test/integration/api/search/search_spec.js
@@ -4,12 +4,12 @@ require('dotenv').load({
 
 const expect = require('expect.js');
 const Q = require('q');
-const cloudinary = require('../cloudinary');
-const helper = require("./spechelper");
+const cloudinary = require('../../../../cloudinary');
+const helper = require("../../../spechelper");
 
 
 
-const testConstants = require('./testUtils/testConstants');
+const testConstants = require('../../../testUtils/testConstants');
 
 const {
   TIMEOUT,
diff --git a/test/uploader_spec.js b/test/integration/api/uploader/uploader_spec.js
similarity index 99%
rename from test/uploader_spec.js
rename to test/integration/api/uploader/uploader_spec.js
index b8f21a0d..79472bef 100644
--- a/test/uploader_spec.js
+++ b/test/integration/api/uploader/uploader_spec.js
@@ -12,8 +12,8 @@ const path = require('path');
 const at = require('lodash/at');
 const uniq = require('lodash/uniq');
 const ClientRequest = require('_http_client').ClientRequest;
-const cloudinary = require("../cloudinary");
-const helper = require("./spechelper");
+const cloudinary = require("../../../../cloudinary");
+const helper = require("../../../spechelper");
 
 const IMAGE_FILE = helper.IMAGE_FILE;
 const LARGE_RAW_FILE = helper.LARGE_RAW_FILE;
@@ -27,9 +27,9 @@ const METADATA_FIELD_UNIQUE_EXTERNAL_ID = 'metadata_field_external_id_' + TEST_I
 const METADATA_FIELD_VALUE = 'metadata_field_value_' + TEST_ID;
 const METADATA_SAMPLE_DATA = { metadata_color: "red", metadata_shape: "dodecahedron" };
 const METADATA_SAMPLE_DATA_ENCODED = "metadata_color=red|metadata_shape=dodecahedron";
-const createTestConfig = require('./testUtils/createTestConfig');
+const createTestConfig = require('../../../testUtils/createTestConfig');
 
-const testConstants = require('./testUtils/testConstants');
+const testConstants = require('../../../testUtils/testConstants');
 const UPLOADER_V2 = cloudinary.v2.uploader;
 
 const {
diff --git a/test/utils/image_versionID_spec.js b/test/utils/image_versionID_spec.js
index 1398afc4..537ac7c1 100644
--- a/test/utils/image_versionID_spec.js
+++ b/test/utils/image_versionID_spec.js
@@ -7,11 +7,13 @@ const expect = require("expect.js");
 const mock = require('mock-fs');
 const getSDKVersionID = require('../../lib/utils/encoding/sdkVersionID/getSDKVersionID');
 const cloudinary = require('../../cloudinary');
-const TEST_CLOUD_NAME = require('../testUtils/testConstants').TEST_CLOUD_NAME
+const TEST_CLOUD_NAME = require('../testUtils/testConstants').TEST_CLOUD_NAME;
 
 describe('Tests for sdk versionID through image tag', function () {
   let processVersions = {};
   beforeEach(() => {
+    cloudinary.config(true); // reset
+
     processVersions = process.versions;
     delete process.versions;
 
diff --git a/test/utils_spec.js b/test/utils/utils_spec.js
similarity index 99%
rename from test/utils_spec.js
rename to test/utils/utils_spec.js
index d502f184..14f2804a 100644
--- a/test/utils_spec.js
+++ b/test/utils/utils_spec.js
@@ -6,19 +6,19 @@ const expect = require("expect.js");
 const fs = require('fs');
 const os = require('os');
 const defaults = require('lodash/defaults');
-const cloudinary = require("../cloudinary");
-const helper = require("./spechelper");
-const TIMEOUT = require('./testUtils/testConstants').TIMEOUT;
-const wait = require('./testUtils/helpers/wait');
-const generateBreakpoints = require(`../${helper.libPath}/utils/generateBreakpoints`);
-const { srcsetUrl, generateSrcsetAttribute } = require(`../${helper.libPath}/utils/srcsetUtils`);
+const cloudinary = require("../../cloudinary");
+const helper = require("../spechelper");
+const TIMEOUT = require('../testUtils/testConstants').TIMEOUT;
+const wait = require('../testUtils/helpers/wait');
+const generateBreakpoints = require(`../../${helper.libPath}/utils/generateBreakpoints`);
+const { srcsetUrl, generateSrcsetAttribute } = require(`../../${helper.libPath}/utils/srcsetUtils`);
 
 const utils = cloudinary.utils;
 const { clone, isString, merge, pickOnlyExistingValues } = utils;
 const { sharedExamples, itBehavesLike, test_cloudinary_url } = helper;
 
 const TEST_TAG = helper.TEST_TAG;
-const createTestConfig = require('./testUtils/createTestConfig');
+const createTestConfig = require('../testUtils/createTestConfig');
 // Defined globals
 var cloud_name = '';