diff --git a/src/xenia/base/testing/threading_test.cc b/src/xenia/base/testing/threading_test.cc
index 1ffcfb545..6e05a1bbf 100644
--- a/src/xenia/base/testing/threading_test.cc
+++ b/src/xenia/base/testing/threading_test.cc
@@ -815,14 +815,14 @@ TEST_CASE("Wait on Timer", "[timer]") {
   // Test Repeating
   REQUIRE(timer->SetRepeatingAfter(1ms, 10ms));
   for (int i = 0; i < 10; ++i) {
-    result = Wait(timer.get(), false, 20ms);
+    result = Wait(timer.get(), false, 100ms);
     INFO(i);
     REQUIRE(result == WaitResult::kSuccess);
   }
   MaybeYield();
   Sleep(10ms);  // Skip a few events
   for (int i = 0; i < 10; ++i) {
-    result = Wait(timer.get(), false, 20ms);
+    result = Wait(timer.get(), false, 100ms);
     REQUIRE(result == WaitResult::kSuccess);
   }
   // Cancel it
diff --git a/xenia-build.py b/xenia-build.py
index cab0e9292..dbe4c61cb 100755
--- a/xenia-build.py
+++ b/xenia-build.py
@@ -1223,7 +1223,8 @@ class TestCommand(BaseBuildCommand):
         # The test executables that will be built and run.
         test_targets = args["target"] or [
             "xenia-base-tests",
-            "xenia-cpu-ppc-tests"
+            "xenia-cpu-tests",
+            "xenia-kernel-tests",
             ]
         args["target"] = test_targets