diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index d8ef195cfa..410a35eeaa 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -24,7 +24,6 @@ std::unique_ptr<cmCommand> cmCTestBuildCommand::Clone()
 {
   auto ni = cm::make_unique<cmCTestBuildCommand>();
   ni->CTest = this->CTest;
-  ni->CTestScriptHandler = this->CTestScriptHandler;
   return std::unique_ptr<cmCommand>(std::move(ni));
 }
 
diff --git a/Source/CTest/cmCTestCommand.h b/Source/CTest/cmCTestCommand.h
index 007378dc2e..ccdef7cc24 100644
--- a/Source/CTest/cmCTestCommand.h
+++ b/Source/CTest/cmCTestCommand.h
@@ -5,7 +5,6 @@
 #include "cmCommand.h"
 
 class cmCTest;
-class cmCTestScriptHandler;
 
 /** \class cmCTestCommand
  * \brief A superclass for all commands added to the CTestScriptHandler
@@ -17,12 +16,5 @@ class cmCTestScriptHandler;
 class cmCTestCommand : public cmCommand
 {
 public:
-  cmCTestCommand()
-  {
-    this->CTest = nullptr;
-    this->CTestScriptHandler = nullptr;
-  }
-
-  cmCTest* CTest;
-  cmCTestScriptHandler* CTestScriptHandler;
+  cmCTest* CTest = nullptr;
 };
diff --git a/Source/CTest/cmCTestConfigureCommand.h b/Source/CTest/cmCTestConfigureCommand.h
index f338637eef..59699dff13 100644
--- a/Source/CTest/cmCTestConfigureCommand.h
+++ b/Source/CTest/cmCTestConfigureCommand.h
@@ -29,7 +29,6 @@ public:
   {
     auto ni = cm::make_unique<cmCTestConfigureCommand>();
     ni->CTest = this->CTest;
-    ni->CTestScriptHandler = this->CTestScriptHandler;
     return std::unique_ptr<cmCommand>(std::move(ni));
   }
 
diff --git a/Source/CTest/cmCTestCoverageCommand.h b/Source/CTest/cmCTestCoverageCommand.h
index 55c68b2012..6eb5868112 100644
--- a/Source/CTest/cmCTestCoverageCommand.h
+++ b/Source/CTest/cmCTestCoverageCommand.h
@@ -32,7 +32,6 @@ public:
   {
     auto ni = cm::make_unique<cmCTestCoverageCommand>();
     ni->CTest = this->CTest;
-    ni->CTestScriptHandler = this->CTestScriptHandler;
     return std::unique_ptr<cmCommand>(std::move(ni));
   }
 
diff --git a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
index ba2b0ebbd3..3ad75ed99e 100644
--- a/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
+++ b/Source/CTest/cmCTestEmptyBinaryDirectoryCommand.h
@@ -33,7 +33,6 @@ public:
   {
     auto ni = cm::make_unique<cmCTestEmptyBinaryDirectoryCommand>();
     ni->CTest = this->CTest;
-    ni->CTestScriptHandler = this->CTestScriptHandler;
     return std::unique_ptr<cmCommand>(std::move(ni));
   }
 
diff --git a/Source/CTest/cmCTestMemCheckCommand.h b/Source/CTest/cmCTestMemCheckCommand.h
index ee39e49a92..fcb48368da 100644
--- a/Source/CTest/cmCTestMemCheckCommand.h
+++ b/Source/CTest/cmCTestMemCheckCommand.h
@@ -30,7 +30,6 @@ public:
   {
     auto ni = cm::make_unique<cmCTestMemCheckCommand>();
     ni->CTest = this->CTest;
-    ni->CTestScriptHandler = this->CTestScriptHandler;
     return std::unique_ptr<cmCommand>(std::move(ni));
   }
 
diff --git a/Source/CTest/cmCTestRunScriptCommand.h b/Source/CTest/cmCTestRunScriptCommand.h
index 510b748631..c7b1c5a80e 100644
--- a/Source/CTest/cmCTestRunScriptCommand.h
+++ b/Source/CTest/cmCTestRunScriptCommand.h
@@ -33,7 +33,6 @@ public:
   {
     auto ni = cm::make_unique<cmCTestRunScriptCommand>();
     ni->CTest = this->CTest;
-    ni->CTestScriptHandler = this->CTestScriptHandler;
     return std::unique_ptr<cmCommand>(std::move(ni));
   }
 
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index a0865dafea..fa44aa324b 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -108,7 +108,6 @@ void cmCTestScriptHandler::AddCTestCommand(
   std::string const& name, std::unique_ptr<cmCTestCommand> command)
 {
   command->CTest = this->CTest;
-  command->CTestScriptHandler = this;
   this->CMake->GetState()->AddBuiltinCommand(name, std::move(command));
 }
 
diff --git a/Source/CTest/cmCTestSleepCommand.h b/Source/CTest/cmCTestSleepCommand.h
index 94255761d0..2d8b91670b 100644
--- a/Source/CTest/cmCTestSleepCommand.h
+++ b/Source/CTest/cmCTestSleepCommand.h
@@ -33,7 +33,6 @@ public:
   {
     auto ni = cm::make_unique<cmCTestSleepCommand>();
     ni->CTest = this->CTest;
-    ni->CTestScriptHandler = this->CTestScriptHandler;
     return std::unique_ptr<cmCommand>(std::move(ni));
   }
 
diff --git a/Source/CTest/cmCTestStartCommand.h b/Source/CTest/cmCTestStartCommand.h
index b3d06a729a..8c72fbc998 100644
--- a/Source/CTest/cmCTestStartCommand.h
+++ b/Source/CTest/cmCTestStartCommand.h
@@ -33,7 +33,6 @@ public:
   {
     auto ni = cm::make_unique<cmCTestStartCommand>();
     ni->CTest = this->CTest;
-    ni->CTestScriptHandler = this->CTestScriptHandler;
     ni->CreateNewTag = this->CreateNewTag;
     ni->Quiet = this->Quiet;
     return std::unique_ptr<cmCommand>(std::move(ni));
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index 029f81f857..0d2501d539 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -29,7 +29,6 @@ std::unique_ptr<cmCommand> cmCTestSubmitCommand::Clone()
 {
   auto ni = cm::make_unique<cmCTestSubmitCommand>();
   ni->CTest = this->CTest;
-  ni->CTestScriptHandler = this->CTestScriptHandler;
   return std::unique_ptr<cmCommand>(std::move(ni));
 }
 
diff --git a/Source/CTest/cmCTestTestCommand.h b/Source/CTest/cmCTestTestCommand.h
index 23661c5a6c..bcaa571189 100644
--- a/Source/CTest/cmCTestTestCommand.h
+++ b/Source/CTest/cmCTestTestCommand.h
@@ -32,7 +32,6 @@ public:
   {
     auto ni = cm::make_unique<cmCTestTestCommand>();
     ni->CTest = this->CTest;
-    ni->CTestScriptHandler = this->CTestScriptHandler;
     return std::unique_ptr<cmCommand>(std::move(ni));
   }
 
diff --git a/Source/CTest/cmCTestUpdateCommand.h b/Source/CTest/cmCTestUpdateCommand.h
index e4c34536f1..fecc4823f2 100644
--- a/Source/CTest/cmCTestUpdateCommand.h
+++ b/Source/CTest/cmCTestUpdateCommand.h
@@ -29,7 +29,6 @@ public:
   {
     auto ni = cm::make_unique<cmCTestUpdateCommand>();
     ni->CTest = this->CTest;
-    ni->CTestScriptHandler = this->CTestScriptHandler;
     return std::unique_ptr<cmCommand>(std::move(ni));
   }
 
diff --git a/Source/CTest/cmCTestUploadCommand.h b/Source/CTest/cmCTestUploadCommand.h
index a9d1dd249f..ade88b0761 100644
--- a/Source/CTest/cmCTestUploadCommand.h
+++ b/Source/CTest/cmCTestUploadCommand.h
@@ -32,7 +32,6 @@ public:
   {
     auto ni = cm::make_unique<cmCTestUploadCommand>();
     ni->CTest = this->CTest;
-    ni->CTestScriptHandler = this->CTestScriptHandler;
     return std::unique_ptr<cmCommand>(std::move(ni));
   }