diff --git a/src/client/common/process/proc.ts b/src/client/common/process/proc.ts
index 46118a4c3c10..428f428719ac 100644
--- a/src/client/common/process/proc.ts
+++ b/src/client/common/process/proc.ts
@@ -3,7 +3,7 @@
 
 import { spawn } from 'child_process';
 import { inject, injectable } from 'inversify';
-import * as Rx from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 import { Disposable } from 'vscode';
 import { createDeferred } from '../helpers';
 import { DEFAULT_ENCODING } from './constants';
@@ -29,7 +29,7 @@ export class ProcessService implements IProcessService {
         const proc = spawn(file, args, spawnOptions);
         let procExited = false;
 
-        const output = new Rx.Observable<Output<string>>(subscriber => {
+        const output = new Observable<Output<string>>(subscriber => {
             const disposables: Disposable[] = [];
 
             const on = (ee: NodeJS.EventEmitter, name: string, fn: Function) => {
diff --git a/src/client/common/process/types.ts b/src/client/common/process/types.ts
index 1dc762e3e811..754cd297dcf9 100644
--- a/src/client/common/process/types.ts
+++ b/src/client/common/process/types.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import { ChildProcess, SpawnOptions as ChildProcessSpawnOptions } from 'child_process';
-import * as Rx from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 import { CancellationToken, Uri } from 'vscode';
 import { ExecutionInfo } from '../types';
 import { EnvironmentVariables } from '../variables/types';
@@ -18,7 +18,7 @@ export type Output<T extends string | Buffer> = {
 };
 export type ObservableExecutionResult<T extends string | Buffer> = {
     proc: ChildProcess;
-    out: Rx.Observable<Output<T>>;
+    out: Observable<Output<T>>;
 };
 
 // tslint:disable-next-line:interface-name
diff --git a/src/test/install/pythonInstallation.test.ts b/src/test/install/pythonInstallation.test.ts
index d67f996d385c..5fff901329a8 100644
--- a/src/test/install/pythonInstallation.test.ts
+++ b/src/test/install/pythonInstallation.test.ts
@@ -3,14 +3,10 @@
 'use strict';
 
 import * as assert from 'assert';
-import { ChildProcess, SpawnOptions } from 'child_process';
 import { Container } from 'inversify';
-import * as Rx from 'rxjs';
 import * as TypeMoq from 'typemoq';
-import * as vscode from 'vscode';
 import { IApplicationShell } from '../../client/common/application/types';
 import { IPythonSettings } from '../../client/common/configSettings';
-import { STANDARD_OUTPUT_CHANNEL } from '../../client/common/constants';
 import { PythonInstaller } from '../../client/common/installer/pythonInstallation';
 import { IPlatformService } from '../../client/common/platform/types';
 import { IInterpreterLocatorService } from '../../client/interpreter/contracts';
diff --git a/src/test/mocks/proc.ts b/src/test/mocks/proc.ts
index 90a8fab492c0..e910d0da4720 100644
--- a/src/test/mocks/proc.ts
+++ b/src/test/mocks/proc.ts
@@ -1,18 +1,16 @@
-import { spawn } from 'child_process';
 import { EventEmitter } from 'events';
-import { decorate, inject, injectable } from 'inversify';
-import * as Rx from 'rxjs';
-import { Disposable } from 'vscode';
-import { ExecutionResult, IBufferDecoder, IProcessService, ObservableExecutionResult, Output, SpawnOptions } from '../../client/common/process/types';
+import { inject, injectable } from 'inversify';
+import 'rxjs/add/observable/of';
+import { Observable } from 'rxjs/Observable';
+import { ExecutionResult, IProcessService, ObservableExecutionResult, Output, SpawnOptions } from '../../client/common/process/types';
 
-type ExecObservableCallback = (result: Rx.Observable<Output<string>> | Output<string>) => void;
+type ExecObservableCallback = (result: Observable<Output<string>> | Output<string>) => void;
 type ExecCallback = (result: ExecutionResult<string>) => void;
 
 export const IOriginalProcessService = Symbol('IProcessService');
 
 @injectable()
 export class MockProcessService extends EventEmitter implements IProcessService {
-    private observableResults: (Rx.Observable<Output<string>> | Output<string>)[] = [];
     constructor( @inject(IOriginalProcessService) private procService: IProcessService) {
         super();
     }
@@ -20,9 +18,9 @@ export class MockProcessService extends EventEmitter implements IProcessService
         this.on('execObservable', handler);
     }
     public execObservable(file: string, args: string[], options: SpawnOptions = {}): ObservableExecutionResult<string> {
-        let value: Rx.Observable<Output<string>> | Output<string> | undefined;
+        let value: Observable<Output<string>> | Output<string> | undefined;
         let valueReturned = false;
-        this.emit('execObservable', file, args, options, (result: Rx.Observable<Output<string>> | Output<string>) => { value = result; valueReturned = true; });
+        this.emit('execObservable', file, args, options, (result: Observable<Output<string>> | Output<string>) => { value = result; valueReturned = true; });
 
         if (valueReturned) {
             const output = value as Output<string>;
@@ -30,13 +28,13 @@ export class MockProcessService extends EventEmitter implements IProcessService
                 return {
                     // tslint:disable-next-line:no-any
                     proc: {} as any,
-                    out: Rx.Observable.of(output)
+                    out: Observable.of(output)
                 };
             } else {
                 return {
                     // tslint:disable-next-line:no-any
                     proc: {} as any,
-                    out: value as Rx.Observable<Output<string>>
+                    out: value as Observable<Output<string>>
                 };
             }
         } else {
@@ -51,6 +49,6 @@ export class MockProcessService extends EventEmitter implements IProcessService
         let valueReturned = false;
         this.emit('exec', file, args, options, (result: ExecutionResult<string>) => { value = result; valueReturned = true; });
 
-        return valueReturned ? value : this.procService.exec(file, args, options);
+        return valueReturned ? value! : this.procService.exec(file, args, options);
     }
 }