diff --git a/aos/ipc_lib/BUILD b/aos/ipc_lib/BUILD
index 91b050c..1989f06 100644
--- a/aos/ipc_lib/BUILD
+++ b/aos/ipc_lib/BUILD
@@ -101,7 +101,6 @@
         "//aos/testing:test_shm",
         "//aos/time",
         "//aos/util:death_test_log_implementation",
-        "//aos/util:thread",
     ],
 )
 
diff --git a/aos/ipc_lib/raw_queue_test.cc b/aos/ipc_lib/raw_queue_test.cc
index 1c02c53..3684029 100644
--- a/aos/ipc_lib/raw_queue_test.cc
+++ b/aos/ipc_lib/raw_queue_test.cc
@@ -8,6 +8,7 @@
 #include <ostream>
 #include <memory>
 #include <map>
+#include <thread>
 
 #include "gtest/gtest.h"
 
@@ -17,7 +18,6 @@
 #include "aos/time/time.h"
 #include "aos/logging/logging.h"
 #include "aos/die.h"
-#include "aos/util/thread.h"
 #include "aos/util/options.h"
 #include "aos/util/death_test_log_implementation.h"
 #include "aos/testing/prevent_exit.h"
@@ -976,16 +976,14 @@
   ASSERT_NE(nullptr, message1);
   ASSERT_NE(nullptr, message2);
   EXPECT_EQ(free_before, queue->FreeMessages());
-  util::FunctionThread t1([message1, queue](util::Thread *) {
+  std::thread t1([message1, queue] {
     queue->FreeMessage(message1);
   });
-  util::FunctionThread t2([message2, queue](util::Thread *) {
+  std::thread t2([message2, queue] {
     queue->FreeMessage(message2);
   });
-  t1.Start();
-  t2.Start();
-  t1.WaitUntilDone();
-  t2.WaitUntilDone();
+  t1.join();
+  t2.join();
   EXPECT_EQ(free_before, queue->FreeMessages());
 }