diff --git a/test/tools/sancov/blacklist.test b/test/tools/sancov/blacklist.test
index e933c76475d..53f48534dc9 100644
--- a/test/tools/sancov/blacklist.test
+++ b/test/tools/sancov/blacklist.test
@@ -1,4 +1,4 @@
-REQUIRES: x86-registered-target
+REQUIRES: x86_64-linux
 RUN: sancov -covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s --check-prefix=ALL
 RUN: sancov -covered-functions -blacklist %p/Inputs/fun_blacklist.txt %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 RUN: sancov -covered-functions -blacklist %p/Inputs/src_blacklist.txt %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.1.sancov | FileCheck --check-prefix=CHECK1 %s
diff --git a/test/tools/sancov/covered_functions.test b/test/tools/sancov/covered_functions.test
index a2de7889431..8126049a0ca 100644
--- a/test/tools/sancov/covered_functions.test
+++ b/test/tools/sancov/covered_functions.test
@@ -1,4 +1,4 @@
-REQUIRES: x86-registered-target
+REQUIRES: x86_64-linux
 RUN: sancov -covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 RUN: sancov -covered-functions -strip_path_prefix=Inputs/ %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck --check-prefix=STRIP_PATH %s
 RUN: sancov -demangle=0 -covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck --check-prefix=NO_DEMANGLE %s
diff --git a/test/tools/sancov/merge.test b/test/tools/sancov/merge.test
index 6c867654583..9c5ca9e6244 100644
--- a/test/tools/sancov/merge.test
+++ b/test/tools/sancov/merge.test
@@ -1,4 +1,4 @@
-REQUIRES: x86-registered-target
+REQUIRES: x86_64-linux
 RUN: sancov -merge %p/Inputs/test-linux_x86_64.0.symcov| FileCheck --check-prefix=MERGE1 %s
 RUN: sancov -merge %p/Inputs/test-linux_x86_64.0.symcov %p/Inputs/test-linux_x86_64.1.symcov| FileCheck --check-prefix=MERGE2 %s
 
diff --git a/test/tools/sancov/not_covered_functions.test b/test/tools/sancov/not_covered_functions.test
index 921d88ec87a..4e0e81a52c2 100644
--- a/test/tools/sancov/not_covered_functions.test
+++ b/test/tools/sancov/not_covered_functions.test
@@ -1,4 +1,4 @@
-REQUIRES: x86-registered-target
+REQUIRES: x86_64-linux
 RUN: sancov -skip-dead-files=0 -not-covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 RUN: sancov -not-covered-functions %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.1.sancov | FileCheck --check-prefix=CHECK1 --allow-empty %s
 
diff --git a/test/tools/sancov/print.test b/test/tools/sancov/print.test
index f0520aead4e..fe94216b051 100644
--- a/test/tools/sancov/print.test
+++ b/test/tools/sancov/print.test
@@ -1,4 +1,4 @@
-REQUIRES: x86-registered-target
+REQUIRES: x86_64-linux
 RUN: sancov -print %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 
 CHECK: 0x4e132b
diff --git a/test/tools/sancov/stats.test b/test/tools/sancov/stats.test
index 1c83e93990d..030d16a9dc6 100644
--- a/test/tools/sancov/stats.test
+++ b/test/tools/sancov/stats.test
@@ -1,4 +1,4 @@
-REQUIRES: x86-registered-target
+REQUIRES: x86_64-linux
 RUN: sancov -print-coverage-stats %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 
 CHECK: all-edges: 8
diff --git a/test/tools/sancov/symbolize.test b/test/tools/sancov/symbolize.test
index 83d29ff489a..3cc426f919b 100644
--- a/test/tools/sancov/symbolize.test
+++ b/test/tools/sancov/symbolize.test
@@ -1,6 +1,5 @@
-REQUIRES: x86-registered-target
-RUN: sancov -symbolize -strip_path_prefix="llvm/" %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s --check-prefixes=CHECK,STRIP
-RUN: sancov -symbolize %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s --check-prefixes=CHECK,NOSTRIP
+REQUIRES: x86_64-linux
+RUN: sancov -symbolize -strip_path_prefix="llvm/" %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 
 CHECK: {
 CHECK-NEXT:  "covered-points": [
@@ -12,8 +11,7 @@ CHECK-NEXT:    "4e1586"
 CHECK-NEXT:  ],
 CHECK-NEXT:  "binary-hash": "BB3CDD5045AED83906F6ADCC1C4DAF7E2596A6B5",
 CHECK-NEXT:  "point-symbol-info": {
-STRIP-NEXT:    "test/tools/sancov/Inputs/test.cpp": {
-NOSTRIP-NEXT:  "/usr/local/google/home/aizatsky/src/llvm/test/tools/sancov/Inputs/test.cpp": {
+CHECK-NEXT:    "test/tools/sancov/Inputs/test.cpp": {
 CHECK-NEXT:      "bar(std::string)": {
 CHECK-NEXT:        "4e132b": "12:0"
 CHECK-NEXT:      },
diff --git a/test/tools/sancov/symbolize_noskip_dead_files.test b/test/tools/sancov/symbolize_noskip_dead_files.test
index 7371f084390..9ddf89cbf56 100644
--- a/test/tools/sancov/symbolize_noskip_dead_files.test
+++ b/test/tools/sancov/symbolize_noskip_dead_files.test
@@ -1,4 +1,4 @@
-REQUIRES: x86-registered-target
+REQUIRES: x86_64-linux
 RUN: sancov -symbolize -skip-dead-files=0 -strip_path_prefix="llvm/" %p/Inputs/test-linux_x86_64 %p/Inputs/test-linux_x86_64.0.sancov | FileCheck %s
 
 CHECK: {
diff --git a/test/tools/sancov/validation.test b/test/tools/sancov/validation.test
index fdcfd0610f8..437870cf597 100644
--- a/test/tools/sancov/validation.test
+++ b/test/tools/sancov/validation.test
@@ -1,4 +1,4 @@
-REQUIRES: x86-registered-target
+REQUIRES: x86_64-linux
 RUN: not sancov -covered-functions %p/Inputs/test-linux_x86_64 2>&1 | FileCheck --check-prefix=NOCFILE %s
 
 NOCFILE: WARNING: No coverage file for {{.*}}test-linux_x86_64
diff --git a/tools/sancov/coverage-report-server.py b/tools/sancov/coverage-report-server.py
index 5ea978fae64..251d8f1b77b 100755
--- a/tools/sancov/coverage-report-server.py
+++ b/tools/sancov/coverage-report-server.py
@@ -32,7 +32,6 @@ import html
 import os
 import string
 import math
-import urllib
 
 INDEX_PAGE_TMPL = """
 <html>
@@ -129,7 +128,6 @@ class ServerHandler(http.server.BaseHTTPRequestHandler):
     src_path = None
 
     def do_GET(self):
-        norm_path = os.path.normpath(urllib.parse.unquote(self.path[1:]))
         if self.path == '/':
             self.send_response(200)
             self.send_header("Content-type", "text/html; charset=utf-8")
@@ -149,8 +147,8 @@ class ServerHandler(http.server.BaseHTTPRequestHandler):
             response = string.Template(INDEX_PAGE_TMPL).safe_substitute(
                 filenames='\n'.join(filelist))
             self.wfile.write(response.encode('UTF-8', 'replace'))
-        elif self.symcov_data.has_file(norm_path):
-            filename = norm_path
+        elif self.symcov_data.has_file(self.path[1:]):
+            filename = self.path[1:]
             filepath = os.path.join(self.src_path, filename) 
             if not os.path.exists(filepath):
                 self.send_response(404)
diff --git a/tools/sancov/sancov.cpp b/tools/sancov/sancov.cpp
index 09826ec239b..e0cc8a7cf84 100644
--- a/tools/sancov/sancov.cpp
+++ b/tools/sancov/sancov.cpp
@@ -469,7 +469,7 @@ static std::unique_ptr<symbolize::LLVMSymbolizer> createSymbolizer() {
 static std::string normalizeFilename(const std::string &FileName) {
   SmallString<256> S(FileName);
   sys::path::remove_dots(S, /* remove_dot_dot */ true);
-  return stripPathPrefix(sys::path::convert_to_slash(S.str()));
+  return stripPathPrefix(S.str().str());
 }
 
 class Blacklists {