diff --git a/.env.example b/.env.example
index 48056d3..445bda0 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,4 @@
 APP_ID=APP_ID
 API_KEY=API_KEY
 API_KEY_ID=API_KEY_ID
+API_URL=API_URL
diff --git a/src/__tests__/CloudKeyStorage.test.ts b/src/__tests__/CloudKeyStorage.test.ts
index c4860a4..6f5e88a 100644
--- a/src/__tests__/CloudKeyStorage.test.ts
+++ b/src/__tests__/CloudKeyStorage.test.ts
@@ -10,6 +10,7 @@ import {
 } from 'virgil-crypto';
 import { JwtGenerator, GeneratorJwtProvider } from 'virgil-sdk';
 
+import KeyknoxClient from '../clients/KeyknoxClient';
 import KeyknoxCrypto from '../cryptos/KeyknoxCrypto';
 import {
   CloudKeyStorageOutOfSyncError,
@@ -59,12 +60,14 @@ describe('CloudKeyStorage', () => {
     });
     accessTokenProvider = new GeneratorJwtProvider(jwtGenerator, undefined, uuid());
     keyPair = virgilCrypto.generateKeys();
-    cloudKeyStorage = CloudKeyStorage.create({
+    const keyknoxManager = new KeyknoxManager(
       accessTokenProvider,
-      virgilCrypto,
-      privateKey: keyPair.privateKey,
-      publicKeys: keyPair.publicKey,
-    });
+      keyPair.privateKey,
+      keyPair.publicKey,
+      new KeyknoxCrypto(virgilCrypto),
+      new KeyknoxClient(process.env.API_URL),
+    );
+    cloudKeyStorage = new CloudKeyStorage(keyknoxManager);
   });
 
   it('KTC-19', async () => {
@@ -286,6 +289,7 @@ describe('CloudKeyStorage', () => {
       keyPair.privateKey,
       keyPair.publicKey,
       new KeyknoxCrypto(virgilCrypto),
+      new KeyknoxClient(process.env.API_URL),
     );
     cloudKeyStorage = new CloudKeyStorage(keyknoxManager);
     await keyknoxManager.pushValue(uuid());
diff --git a/src/__tests__/KeyknoxManager.test.ts b/src/__tests__/KeyknoxManager.test.ts
index a4b3d1a..f51644d 100644
--- a/src/__tests__/KeyknoxManager.test.ts
+++ b/src/__tests__/KeyknoxManager.test.ts
@@ -52,6 +52,7 @@ describe('KeyknoxManager', () => {
       privateKey,
       publicKey,
       new KeyknoxCrypto(virgilCrypto),
+      new KeyknoxClient(process.env.API_URL),
     );
   }
 
@@ -267,7 +268,7 @@ describe('KeyknoxManager', () => {
     });
     const accessTokenProvider = new GeneratorJwtProvider(jwtGenerator, undefined, uuid());
     const [keyPair] = generateKeyPairs(1);
-    const keyknoxClient = new KeyknoxClient();
+    const keyknoxClient = new KeyknoxClient(process.env.API_URL);
     const keyknoxManager = new KeyknoxManager(
       accessTokenProvider,
       keyPair.privateKey,
diff --git a/src/__tests__/SyncKeyStorage.test.ts b/src/__tests__/SyncKeyStorage.test.ts
index d988e3d..224ffa8 100644
--- a/src/__tests__/SyncKeyStorage.test.ts
+++ b/src/__tests__/SyncKeyStorage.test.ts
@@ -5,6 +5,7 @@ import uuid from 'uuid/v4';
 import { initCrypto, VirgilCrypto, VirgilAccessTokenSigner } from 'virgil-crypto';
 import { IKeyEntry, KeyEntryStorage, JwtGenerator, GeneratorJwtProvider } from 'virgil-sdk';
 
+import KeyknoxClient from '../clients/KeyknoxClient';
 import KeyknoxCrypto from '../cryptos/KeyknoxCrypto';
 import CloudKeyStorage from '../CloudKeyStorage';
 import { KeyEntry } from '../entities';
@@ -57,6 +58,7 @@ describe('SyncKeyStorage', () => {
       keyPair.privateKey,
       keyPair.publicKey,
       new KeyknoxCrypto(virgilCrypto),
+      new KeyknoxClient(process.env.API_URL),
     );
     cloudKeyStorage = new CloudKeyStorage(keyknoxManager);
     keyEntryStorageWrapper = new KeyEntryStorageWrapper(identity, keyEntryStorage);
diff --git a/src/clients/__tests__/KeyknoxClient.test.ts b/src/clients/__tests__/KeyknoxClient.test.ts
index 168efd1..286cf36 100644
--- a/src/clients/__tests__/KeyknoxClient.test.ts
+++ b/src/clients/__tests__/KeyknoxClient.test.ts
@@ -15,7 +15,7 @@ describe('KeyknoxClient', () => {
   });
 
   beforeEach(() => {
-    client = new KeyknoxClient();
+    client = new KeyknoxClient(process.env.API_URL);
     const virgilCrypto = new VirgilCrypto();
     const virgilAccessTokenSigner = new VirgilAccessTokenSigner(virgilCrypto);
     const apiKey = virgilCrypto.importPrivateKey({