Index: test/asan/TestCases/invalid-pointer-pairs-compare-errors.cc
===================================================================
--- test/asan/TestCases/invalid-pointer-pairs-compare-errors.cc
+++ test/asan/TestCases/invalid-pointer-pairs-compare-errors.cc
@@ -10,8 +10,12 @@
 }
 
 char global1[100] = {}, global2[100] = {};
+char __attribute__((used)) smallest_global[5] = {};
 char small_global[7] = {};
+char __attribute__((used)) little_global[10] = {};
+char __attribute__((used)) medium_global[4000] = {};
 char large_global[5000] = {};
+char __attribute__((used)) largest_global[6000] = {};
 
 int main() {
   // Heap allocated memory.
Index: test/asan/TestCases/invalid-pointer-pairs-subtract-success.cc
===================================================================
--- test/asan/TestCases/invalid-pointer-pairs-subtract-success.cc
+++ test/asan/TestCases/invalid-pointer-pairs-subtract-success.cc
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 int bar(char *p, char *q) {
-  return p <= q;
+  return p - q;
 }
 
 char global[10000] = {};