diff --git a/command/agent/testagent.go b/command/agent/testagent.go
index 6504c8cbe..1fa14879a 100644
--- a/command/agent/testagent.go
+++ b/command/agent/testagent.go
@@ -84,6 +84,9 @@ type TestAgent struct {
 
 	// Enterprise specifies if the agent is enterprise or not
 	Enterprise bool
+
+	// shutdown is set to true if agent has been shutdown
+	shutdown bool
 }
 
 // NewTestAgent returns a started agent with the given name and
@@ -259,6 +262,11 @@ func (a *TestAgent) start() (*Agent, error) {
 // Shutdown stops the agent and removes the data directory if it is
 // managed by the test agent.
 func (a *TestAgent) Shutdown() error {
+	if a.shutdown {
+		return nil
+	}
+	a.shutdown = true
+
 	defer freeport.Return(a.ports)
 
 	defer func() {