diff --git a/third_party/libaddressinput/libaddressinput.gyp b/third_party/libaddressinput/libaddressinput.gyp
index 1745f5b81b6133..2ae761a8d18c32 100644
--- a/third_party/libaddressinput/libaddressinput.gyp
+++ b/third_party/libaddressinput/libaddressinput.gyp
@@ -4,6 +4,7 @@
 {
   'includes': ['src/cpp/libaddressinput.gypi'],
   'variables': {
+    'libaddressinput_test_data_dir%': 'src/third_party/libaddressinput/src/testdata',
     'libaddressinput_util_files': [
       'src/cpp/src/address_data.cc',
       'src/cpp/src/address_field.cc',
@@ -144,7 +145,7 @@
         'chromium/trie_unittest.cc',
       ],
       'defines': [
-        'TEST_DATA_DIR="third_party/libaddressinput/src/testdata"',
+        'TEST_DATA_DIR="<(libaddressinput_test_data_dir)"',
       ],
       'include_dirs': [
         '../../',
diff --git a/tools/valgrind/gtest_exclude/libaddressinput_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/libaddressinput_unittests.gtest-drmemory_win32.txt
deleted file mode 100644
index 7654fea7d4b92b..00000000000000
--- a/tools/valgrind/gtest_exclude/libaddressinput_unittests.gtest-drmemory_win32.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# fail in native run
-RuleTest.CanonicalizeSubKeyTest
-# fail on bot only and fail natively, cannot reproduce locally
-AddressValidatorTest.*
-CountryRulesAggregatorTest.ValidRulesets
-ExampleAddressValidatorTest.examples
-RetrieverTest.*
-FakeDownloaderTest.*
-
-# Test crashes - http://crbug.com/395169
-AddressInputHelperTest.*
-# These are speculatively assumed to be part of the same issue:
-RegionDataBuilderTest.*
-PreloadSupplierTest.*
-
-# Crashes: http://crbug.com/396203
-AddressNormalizerTest.*