diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
index e6d529bcde9..3cb83faf610 100644
--- a/src/harness/harnessLanguageService.ts
+++ b/src/harness/harnessLanguageService.ts
@@ -219,21 +219,7 @@ namespace Harness.LanguageService {
             return snapshot.getText(0, snapshot.getLength());
         }
         resolvePath(path: string): string {
-            // Reduce away "." and ".."
-            const parts = path.split("/");
-            const res: string[] = [];
-            for (let i = 0; i < parts.length; i++) {
-                if (parts[i] === ".") {
-                    continue;
-                }
-                else if (parts[i] === ".." && res.length > 0) {
-                    res.splice(res.length - 1, 1);
-                }
-                else {
-                    res.push(parts[i]);
-                }
-            }
-            return res.join("/");
+            return ts.normalizePath(ts.isRootedDiskPath(path) ? path : ts.combinePaths(this.getCurrentDirectory(), path));
         }
 
 
diff --git a/src/services/services.ts b/src/services/services.ts
index 704a12fda21..d440f194b70 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -4389,13 +4389,13 @@ namespace ts {
 
                 const toComplete = getBaseFileName(fragment);
                 const absolutePath = normalizeSlashes(host.resolvePath(isRootedDiskPath(fragment) ? fragment : combinePaths(scriptPath, fragment)));
-                const baseDir = getDirectoryPath(absolutePath);
+                const baseDir = toComplete ? getDirectoryPath(absolutePath) : absolutePath;
 
 
                 if (directoryProbablyExists(baseDir, host)) {
                     // Enumerate the available files
                     const files = host.readDirectory(baseDir, extensions, /*exclude*/undefined, /*include*/["./*"]);
-                    ts.forEach(files, (f) => {
+                    forEach(files, (f) => {
                         const fName = includeExtensions ? getBaseFileName(f) : removeFileExtension(getBaseFileName(f));
 
                         if (startsWith(fName, toComplete)) {
@@ -4411,7 +4411,7 @@ namespace ts {
                     // If possible, get folder completion as well
                     if (host.getDirectories) {
                         const directories = host.getDirectories(baseDir);
-                        ts.forEach(directories, (d) => {
+                        forEach(directories, (d) => {
                             const dName = getBaseFileName(removeTrailingDirectorySeparator(d));
 
                             if (startsWith(dName, toComplete)) {