diff --git a/test/scoped_guarded_page_test.cc b/test/scoped_guarded_page_test.cc
index 00fba7ef..023d1ed1 100644
--- a/test/scoped_guarded_page_test.cc
+++ b/test/scoped_guarded_page_test.cc
@@ -23,6 +23,8 @@ namespace test {
 namespace {
 
 TEST(ScopedGuardedPage, BasicFunctionality) {
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
+
   ScopedGuardedPage page;
   char* address = (char*)page.Pointer();
   EXPECT_NE(address, nullptr);
diff --git a/test/test.gyp b/test/test.gyp
index 29737088..8101f8f2 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -63,6 +63,8 @@
         'multiprocess_posix.cc',
         'process_type.cc',
         'process_type.h',
+        'scoped_guarded_page.h',
+        'scoped_guarded_page_posix.cc',
         'scoped_module_handle.cc',
         'scoped_module_handle.h',
         'scoped_temp_dir.cc',
diff --git a/test/test_test.gyp b/test/test_test.gyp
index 3c6d7066..ddd920e9 100644
--- a/test/test_test.gyp
+++ b/test/test_test.gyp
@@ -39,6 +39,7 @@
         'main_arguments_test.cc',
         'multiprocess_exec_test.cc',
         'multiprocess_posix_test.cc',
+        'scoped_guarded_page_test.cc',
         'scoped_temp_dir_test.cc',
         'test_paths_test.cc',
         'win/win_child_process_test.cc',
diff --git a/util/process/process_memory_range_test.cc b/util/process/process_memory_range_test.cc
index eb457c76..19de2b10 100644
--- a/util/process/process_memory_range_test.cc
+++ b/util/process/process_memory_range_test.cc
@@ -55,7 +55,7 @@ TEST(ProcessMemoryRange, Basic) {
 #elif defined(OS_WIN)
   ProcessMemoryWin memory;
   ASSERT_TRUE(memory.Initialize(GetCurrentProcess()));
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_ANDROID)
   ProcessMemoryLinux memory;
   ASSERT_TRUE(memory.Initialize(getpid()));
 #endif  // OS_FUCHSIA