diff --git a/t/pt-agent/run_agent.t b/t/pt-agent/run_agent.t
index 2eeebd24..4a701415 100644
--- a/t/pt-agent/run_agent.t
+++ b/t/pt-agent/run_agent.t
@@ -141,7 +141,7 @@ is(
    "init_config_file()"
 );
 
-my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 0);
+my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 1);
 mkdir "$tmpdir/services" or die "Error making $tmpdir/services: $OS_ERROR";
 
 my @ok_code = ();  # callbacks
diff --git a/t/pt-agent/run_service.t b/t/pt-agent/run_service.t
index df9f2135..b7fdb2b4 100644
--- a/t/pt-agent/run_service.t
+++ b/t/pt-agent/run_service.t
@@ -36,7 +36,7 @@ my $sample = "t/pt-agent/samples";
 # Create fake spool and lib dirs.  Service-related subs in pt-agent
 # automatically add "/services" to the lib dir, but the spool dir is
 # used as-is.
-my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 0);
+my $tmpdir = tempdir("/tmp/pt-agent.$PID.XXXXXX", CLEANUP => 1);
 mkdir "$tmpdir/spool"    or die "Error making $tmpdir/spool: $OS_ERROR";
 mkdir "$tmpdir/services" or die "Error making $tmpdir/services: $OS_ERROR";
 my $spool_dir = "$tmpdir/spool";