diff --git a/wpilibc/src/test/native/cpp/WatchdogTest.cpp b/wpilibc/src/test/native/cpp/WatchdogTest.cpp
index 9379f111ac..0e33511d6d 100644
--- a/wpilibc/src/test/native/cpp/WatchdogTest.cpp
+++ b/wpilibc/src/test/native/cpp/WatchdogTest.cpp
@@ -9,8 +9,6 @@
 
 #include <stdint.h>
 
-#include <wpi/raw_ostream.h>
-
 #include "frc/simulation/SimHooks.h"
 #include "gtest/gtest.h"
 
@@ -31,23 +29,23 @@ TEST_F(WatchdogTest, EnableDisable) {
 
   Watchdog watchdog(0.4_s, [&] { watchdogCounter++; });
 
-  wpi::outs() << "Run 1\n";
+  // Run 1
   watchdog.Enable();
   frc::sim::StepTiming(0.2_s);
   watchdog.Disable();
 
   EXPECT_EQ(0u, watchdogCounter) << "Watchdog triggered early";
 
-  wpi::outs() << "Run 2\n";
+  // Run 2
   watchdogCounter = 0;
   watchdog.Enable();
-  frc::sim::StepTiming(0.6_s);
+  frc::sim::StepTiming(0.4_s);
   watchdog.Disable();
 
   EXPECT_EQ(1u, watchdogCounter)
       << "Watchdog either didn't trigger or triggered more than once";
 
-  wpi::outs() << "Run 3\n";
+  // Run 3
   watchdogCounter = 0;
   watchdog.Enable();
   frc::sim::StepTiming(1_s);
@@ -74,7 +72,7 @@ TEST_F(WatchdogTest, Reset) {
 TEST_F(WatchdogTest, SetTimeout) {
   uint32_t watchdogCounter = 0;
 
-  Watchdog watchdog(1.0_s, [&] { watchdogCounter++; });
+  Watchdog watchdog(1_s, [&] { watchdogCounter++; });
 
   watchdog.Enable();
   frc::sim::StepTiming(0.2_s);
@@ -111,7 +109,7 @@ TEST_F(WatchdogTest, Epochs) {
 
   Watchdog watchdog(0.4_s, [&] { watchdogCounter++; });
 
-  wpi::outs() << "Run 1\n";
+  // Run 1
   watchdog.Enable();
   watchdog.AddEpoch("Epoch 1");
   frc::sim::StepTiming(0.1_s);
@@ -122,7 +120,7 @@ TEST_F(WatchdogTest, Epochs) {
 
   EXPECT_EQ(0u, watchdogCounter) << "Watchdog triggered early";
 
-  wpi::outs() << "Run 2\n";
+  // Run 2
   watchdog.Enable();
   watchdog.AddEpoch("Epoch 1");
   frc::sim::StepTiming(0.2_s);
diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java
index 2e608eff9e..d99d7db0d1 100644
--- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java
+++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/WatchdogTest.java
@@ -41,17 +41,17 @@ class WatchdogTest {
     try (Watchdog watchdog = new Watchdog(0.4, () -> {
       watchdogCounter.addAndGet(1);
     })) {
-      System.out.println("Run 1");
+      // Run 1
       watchdog.enable();
       SimHooks.stepTiming(0.2);
       watchdog.disable();
 
       assertEquals(0, watchdogCounter.get(), "Watchdog triggered early");
 
-      System.out.println("Run 2");
+      // Run 2
       watchdogCounter.set(0);
       watchdog.enable();
-      SimHooks.stepTiming(0.6);
+      SimHooks.stepTiming(0.4);
       watchdog.disable();
 
       assertEquals(1, watchdogCounter.get(),
@@ -60,7 +60,7 @@ class WatchdogTest {
       // Run 3
       watchdogCounter.set(0);
       watchdog.enable();
-      SimHooks.stepTiming(1);
+      SimHooks.stepTiming(1.0);
       watchdog.disable();
 
       assertEquals(1, watchdogCounter.get(),
@@ -137,7 +137,7 @@ class WatchdogTest {
     try (Watchdog watchdog = new Watchdog(0.4, () -> {
       watchdogCounter.addAndGet(1);
     })) {
-      System.out.println("Run 1");
+      // Run 1
       watchdog.enable();
       watchdog.addEpoch("Epoch 1");
       SimHooks.stepTiming(0.1);
@@ -148,7 +148,7 @@ class WatchdogTest {
 
       assertEquals(0, watchdogCounter.get(), "Watchdog triggered early");
 
-      System.out.println("Run 2");
+      // Run 2
       watchdog.enable();
       watchdog.addEpoch("Epoch 1");
       SimHooks.stepTiming(0.2);