diff --git a/build/tfs/linux/Dockerfile b/build/tfs/linux/Dockerfile
index 57ee735bbb7..63f9b87f7d2 100644
--- a/build/tfs/linux/Dockerfile
+++ b/build/tfs/linux/Dockerfile
@@ -29,6 +29,7 @@ RUN apt-get install -y libx11-xcb-dev libx11-xcb-dev:i386
 RUN apt-get install -y libgl1-mesa-glx:i386 libgl1-mesa-dri:i386
 RUN apt-get install -y libxkbfile-dev
 RUN apt-get install -y bc bsdmainutils
+RUN apt-get install -y libsecret-1-dev
 
 # Xvfb
 # Thanks https://medium.com/@griggheo/running-headless-selenium-webdriver-tests-in-docker-containers-342fdbabf756
diff --git a/package.json b/package.json
index a112c16e7a5..d9064cc3cfa 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
     "https-proxy-agent": "0.3.6",
     "iconv-lite": "0.4.15",
     "jschardet": "^1.4.2",
-    "keytar": "^4.0.3",
     "minimist": "1.2.0",
     "native-keymap": "1.2.4",
     "node-pty": "0.6.9",
@@ -126,6 +125,7 @@
     "url": "https://github.com/Microsoft/vscode/issues"
   },
   "optionalDependencies": {
+    "keytar": "^4.0.3",
     "windows-foreground-love": "0.1.0",
     "windows-mutex": "^0.2.0",
     "fsevents": "0.3.8"
diff --git a/src/vs/platform/credentials/node/credentialsService.ts b/src/vs/platform/credentials/node/credentialsService.ts
index 9aa9461ac5a..3aa636bb098 100644
--- a/src/vs/platform/credentials/node/credentialsService.ts
+++ b/src/vs/platform/credentials/node/credentialsService.ts
@@ -6,7 +6,14 @@
 
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
-import * as keytar from 'keytar';
+
+import * as keytarType from 'keytar';
+let keytar: typeof keytarType;
+require(['keytar'], ([k]) => {
+	keytar = k;
+}, err => {
+	// TODO chrmarti
+});
 
 export class CredentialsService implements ICredentialsService {