diff --git a/doc/changes/DM-45635.misc.rst b/doc/changes/DM-45635.misc.rst
new file mode 100644
index 00000000..9b7f2b8c
--- /dev/null
+++ b/doc/changes/DM-45635.misc.rst
@@ -0,0 +1 @@
+Fixed to remove tmp directories created in TestClusteredQuantumGraph.
diff --git a/tests/test_clustered_quantum_graph.py b/tests/test_clustered_quantum_graph.py
index 555aaeae..31070df1 100644
--- a/tests/test_clustered_quantum_graph.py
+++ b/tests/test_clustered_quantum_graph.py
@@ -32,6 +32,7 @@
 # pylint: disable=invalid-name
 
 import os
+import shutil
 import tempfile
 import unittest
 from collections import Counter
@@ -108,9 +109,7 @@ def setUp(self):
         self.qgraph, self.cqg1 = make_test_clustered_quantum_graph(self.tmpdir)
 
     def tearDown(self):
-        pass
-        # if self.tmpdir is not None and os.path.exists(self.tmpdir):
-        #    shutil.rmtree(self.tmppath, ignore_errors=True)
+        shutil.rmtree(self.tmpdir, ignore_errors=True)
 
     def testName(self):
         self.assertEqual(self.cqg1.name, "cqg1")
@@ -119,9 +118,6 @@ def testQgraph(self):
         """Test qgraph method."""
         self.assertEqual(self.cqg1.qgraph, self.qgraph)
 
-    # def testAddClusterSingle(self):
-    #    """Test add_cluster method for single new cluster."""
-
     def testGetClusterExists(self):
         """Test get_cluster method where cluster exists."""
         self.assertEqual("T1_1_2", self.cqg1.get_cluster("T1_1_2").name)
@@ -131,12 +127,6 @@ def testGetClusterMissing(self):
         with self.assertRaises(KeyError):
             _ = self.cqg1.get_cluster("Not_There")
 
-    # def testGetQuantumNodeExists(self):
-    #     """Test get_quantum_node method where node exists."""
-    #
-    # def testGetQuantumNodeMissing(self):
-    #     """Test get_quantum_node method where node doesn't exist."""
-
     def testClusters(self):
         """Test clusters method returns in correct order."""
 
@@ -158,8 +148,6 @@ def testPredecessorsNone(self):
         # check iterable and empty
         self.assertEqual(len(list(self.cqg1.predecessors("T1_1_2"))), 0)
 
-    # def testAddDependency(self):
-
     def testSaveAndLoad(self):
         path = Path(f"{self.tmpdir}/save_1.pickle")
         self.cqg1.save(path)