diff --git a/tests/src/App/CMakeLists.txt b/tests/src/App/CMakeLists.txt
index d2b8d95226..6ba90417b2 100644
--- a/tests/src/App/CMakeLists.txt
+++ b/tests/src/App/CMakeLists.txt
@@ -17,7 +17,7 @@ target_sources(Tests_run PRIVATE
         MappedName.cpp
         Metadata.cpp
         ProjectFile.cpp
-	Property.h
+        Property.h
         Property.cpp
         PropertyExpressionEngine.cpp
         StringHasher.cpp
diff --git a/tests/src/Mod/Spreadsheet/App/CMakeLists.txt b/tests/src/Mod/Spreadsheet/App/CMakeLists.txt
index 4114b51bdf..06fda257d3 100644
--- a/tests/src/Mod/Spreadsheet/App/CMakeLists.txt
+++ b/tests/src/Mod/Spreadsheet/App/CMakeLists.txt
@@ -1,5 +1,6 @@
 target_sources(Spreadsheet_tests_run PRIVATE
             PropertySheet.cpp
+            RenameProperty.cpp
 )
 
 target_include_directories(Spreadsheet_tests_run PUBLIC
diff --git a/tests/src/Mod/Spreadsheet/App/RenameProperty.cpp b/tests/src/Mod/Spreadsheet/App/RenameProperty.cpp
new file mode 100644
index 0000000000..ff182addb4
--- /dev/null
+++ b/tests/src/Mod/Spreadsheet/App/RenameProperty.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+ *   Copyright (c) 2025 Pieter Hijma <info@pieterhijma.net>                 *
+ *                                                                          *
+ *   This file is part of the FreeCAD CAx development system.               *
+ *                                                                          *
+ *   This library is free software; you can redistribute it and/or          *
+ *   modify it under the terms of the GNU Library General Public            *
+ *   License as published by the Free Software Foundation; either           *
+ *   version 2 of the License, or (at your option) any later version.       *
+ *                                                                          *
+ *   This library  is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *   GNU Library General Public License for more details.                   *
+ *                                                                          *
+ *   You should have received a copy of the GNU Library General Public      *
+ *   License along with this library; see the file COPYING.LIB. If not,     *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,          *
+ *   Suite 330, Boston, MA  02111-1307, USA                                 *
+ *                                                                          *
+ ****************************************************************************/
+
+#include <gtest/gtest.h>
+
+#include <Mod/Spreadsheet/App/Sheet.h>
+
+#include "src/App/Property.h"
+
+class SpreadsheetRenameProperty: public RenameProperty
+{
+protected:
+    void SetUp() override
+    {
+        RenameProperty::SetUp();
+        sheet = freecad_cast<Spreadsheet::Sheet*>(_doc->addObject("Spreadsheet::Sheet", "Sheet"));
+    }
+
+    void TearDown() override
+    {
+        _doc->removeObject(sheet->getNameInDocument());
+        RenameProperty::TearDown();
+    }
+
+    Spreadsheet::Sheet* sheet {};
+};
+
+std::string RenameProperty::_docName;
+App::Document* RenameProperty::_doc {nullptr};
+
+// Tests whether we can rename a property that is used in a spreadsheet
+TEST_F(SpreadsheetRenameProperty, renameProperty)
+{
+    // Arrange
+    sheet->setCell("A1", "=VarSet.Variable");
+    _doc->recompute();
+    auto* propSpreadsheet = static_cast<App::PropertyInteger*>(sheet->getPropertyByName("A1"));
+
+    // Assert before the rename
+    EXPECT_EQ(prop->getValue(), Value);
+    EXPECT_EQ(propSpreadsheet->getValue(), Value);
+
+    // Act
+    bool isRenamed = varSet->renameDynamicProperty(prop, "NewName");
+    _doc->recompute();
+
+    // Assert after the rename
+    EXPECT_TRUE(isRenamed);
+    EXPECT_STREQ(varSet->getPropertyName(prop), "NewName");
+    EXPECT_EQ(prop->getValue(), Value);
+
+    EXPECT_EQ(varSet->getDynamicPropertyByName("Variable"), nullptr);
+    EXPECT_EQ(varSet->getDynamicPropertyByName("NewName"), prop);
+
+    std::string cellContent;
+    sheet->getCell(App::CellAddress("A1"))->getStringContent(cellContent);
+
+    EXPECT_EQ(cellContent, "=VarSet.NewName");
+    EXPECT_EQ(propSpreadsheet->getValue(), Value);
+}