diff --git a/compiler-rt/test/tsan/atexit4.cpp b/compiler-rt/test/tsan/atexit4.cpp
index 7102b3a43213c..6126e8c1622e1 100644
--- a/compiler-rt/test/tsan/atexit4.cpp
+++ b/compiler-rt/test/tsan/atexit4.cpp
@@ -17,6 +17,7 @@ static void race() {
 }
 
 struct X {
+  __attribute__((noinline))
   X() { atexit(race); }
 } x;
 
diff --git a/compiler-rt/test/tsan/atexit5.cpp b/compiler-rt/test/tsan/atexit5.cpp
index ef3b3858251e4..e24f15d597ca1 100644
--- a/compiler-rt/test/tsan/atexit5.cpp
+++ b/compiler-rt/test/tsan/atexit5.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
+// RUN: %clangxx_tsan -O1 -fno-inline-functions %s -o %t && %deflake %run %t | FileCheck %s
 #include "test.h"
 #include <memory>