diff --git a/tools/test-runner b/tools/test-runner
index 0649109b..f898ae1e 100755
--- a/tools/test-runner
+++ b/tools/test-runner
@@ -172,6 +172,11 @@ class Process:
 		self.write_fds = []
 		self.io_watch = None
 
+		if not namespace:
+			self.output_name = '/tmp/%s-out' % self.name
+		else:
+			self.output_name = '/tmp/%s-%s-out' % (self.name, namespace)
+
 		if namespace:
 			self.args = ['ip', 'netns', 'exec', namespace]
 			self.args.extend(args)
@@ -181,7 +186,7 @@ class Process:
 		# (/tmp/<name>-out). If any verbose options are required this file
 		# will get an IO watch and write out any bytes to the needed FDs.
 		#
-		self.stdout = open('/tmp/%s-out' % self.name, 'a+')
+		self.stdout = open(self.output_name, 'a+')
 		self.io_position = self.stdout.tell()
 
 		if ctx:
@@ -285,6 +290,8 @@ class Process:
 			for f in self.write_fds:
 				f.close()
 
+		os.remove(self.output_name)
+
 	def kill(self, force=False):
 		print("Killing process %s" % self.args)