diff --git a/src/GuiRunner/TestModel.Tests/TestCentricProjectTests.cs b/src/GuiRunner/TestModel.Tests/TestCentricProjectTests.cs
index 65bddba2e..391bffda1 100644
--- a/src/GuiRunner/TestModel.Tests/TestCentricProjectTests.cs
+++ b/src/GuiRunner/TestModel.Tests/TestCentricProjectTests.cs
@@ -493,6 +493,24 @@ public void Load_SetsProjectPath()
             Assert.That(loadedProject.ProjectPath, Is.EqualTo("TestCentricTestProject.tcproj"));
         }
 
+        [Test]
+        public void Load_SetsTestFiles()
+        {
+            // 1. Arrange
+            TestCentricProject project = new TestCentricProject(new GuiOptions("Test1.dll", "Test2.dll"));
+            project.SaveAs("TestCentricTestProject.tcproj");
+
+            TestCentricProject loadedProject = new TestCentricProject();
+
+            // 2. Act
+            loadedProject.Load("TestCentricTestProject.tcproj");
+
+            // 3. Assert
+            Assert.That(loadedProject.TestFiles.Count, Is.EqualTo(2));
+            Assert.That(loadedProject.TestFiles[0], Does.EndWith("Test1.dll"));
+            Assert.That(loadedProject.TestFiles[1], Does.Contain("Test2.dll"));
+        }
+
         #endregion
 
         #region FileName and ProjectPath Tests
diff --git a/src/GuiRunner/TestModel/TestCentricProject.cs b/src/GuiRunner/TestModel/TestCentricProject.cs
index de188b9ba..cbddaf753 100644
--- a/src/GuiRunner/TestModel/TestCentricProject.cs
+++ b/src/GuiRunner/TestModel/TestCentricProject.cs
@@ -100,6 +100,11 @@ public void Load(string path)
                     }
                 }
 
+                // Update the list of test files
+                TestFiles.Clear();
+                foreach (TestPackage subPackage in TopLevelPackage.SubPackages)
+                    TestFiles.Add(subPackage.FullName);
+
                 bool FindTestCentricProjectElement()
                 {
                     while (xmlReader.Read())