diff --git a/tests/test_elements/test_mol2mol/test_mol2scaffold.py b/tests/test_elements/test_mol2mol/test_mol2scaffold.py
new file mode 100644
index 00000000..842197a7
--- /dev/null
+++ b/tests/test_elements/test_mol2mol/test_mol2scaffold.py
@@ -0,0 +1,93 @@
+"""Test the mol2scaffold module."""
+
+from unittest import TestCase
+
+from molpipeline import Pipeline
+from molpipeline.any2mol import AutoToMol
+from molpipeline.mol2any import MolToSmiles
+from molpipeline.mol2mol.scaffolds import MakeScaffoldGeneric, MurckoScaffold
+
+
+class TestMurckoScaffold(TestCase):
+    """Test the MurckoScaffold class."""
+
+    def test_murcko_scaffold_generation_pipeline(self):
+        """Test the scaffold generation."""
+        scaffold_pipeline = Pipeline(
+            steps=[
+                ("smiles_to_mol", AutoToMol()),
+                ("murcko_scaffold", MurckoScaffold()),
+                ("scaffold_to_smiles", MolToSmiles()),
+            ]
+        )
+        smiles_list = ["Cc1ccc(=O)[nH]c1", "O=CC1CCC(c2ccccc2)CC1", "CCC"]
+        expected_scaffold_list = ["O=c1cccc[nH]1", "c1ccc(C2CCCCC2)cc1", ""]
+
+        scaffold_list = scaffold_pipeline.transform(smiles_list)
+        for scaffold, expected_scaffold in zip(scaffold_list, expected_scaffold_list):
+            self.assertEqual(expected_scaffold, scaffold)
+
+
+class TestMakeScaffoldGeneric(TestCase):
+    """Test the MakeScaffoldGeneric class."""
+
+    def setUp(self):
+        """Set up the pipeline and common variables."""
+        self.generic_scaffold_pipeline = Pipeline(
+            steps=[
+                ("smiles_to_mol", AutoToMol()),
+                ("murcko_scaffold", MurckoScaffold()),
+                ("make_scaffold_generic", MakeScaffoldGeneric()),
+                ("scaffold_to_smiles", MolToSmiles()),
+            ]
+        )
+        self.smiles_list = ["Cc1ccc(=O)[nH]c1", "O=CC1CCC(c2ccccc2)CC1", "CCC"]
+
+    def check_generic_scaffold(self, params, expected_scaffold_list):
+        """Helper function to set parameters and check the results."""
+        self.generic_scaffold_pipeline.set_params(**params)
+        generic_scaffold_list = self.generic_scaffold_pipeline.transform(
+            self.smiles_list
+        )
+        for generic_scaffold, expected_generic_scaffold in zip(
+            generic_scaffold_list, expected_scaffold_list
+        ):
+            self.assertEqual(expected_generic_scaffold, generic_scaffold)
+
+    def test_generic_scaffold_generation_pipeline(self):
+        """Test the generic scaffold generation."""
+        self.check_generic_scaffold(
+            params={}, expected_scaffold_list=["CC1CCCCC1", "C1CCC(C2CCCCC2)CC1", ""]
+        )
+
+        # Test the generic scaffold generation with generic atoms
+        self.check_generic_scaffold(
+            params={"make_scaffold_generic__generic_atoms": True},
+            expected_scaffold_list=["**1*****1", "*1***(*2*****2)**1", ""],
+        )
+
+        # Test the generic scaffold generation with generic bonds
+        self.check_generic_scaffold(
+            params={
+                "make_scaffold_generic__generic_atoms": False,
+                "make_scaffold_generic__generic_bonds": True,
+            },
+            expected_scaffold_list=[
+                "C~C1~C~C~C~C~C~1",
+                "C1~C~C~C(~C2~C~C~C~C~C~2)~C~C~1",
+                "",
+            ],
+        )
+
+        # Test the generic scaffold generation with generic atoms and bonds
+        self.check_generic_scaffold(
+            params={
+                "make_scaffold_generic__generic_atoms": True,
+                "make_scaffold_generic__generic_bonds": True,
+            },
+            expected_scaffold_list=[
+                "*~*1~*~*~*~*~*~1",
+                "*1~*~*~*(~*2~*~*~*~*~*~2)~*~*~1",
+                "",
+            ],
+        )