diff --git a/src/Mod/PartDesign/PartDesignTests/TestChamfer.py b/src/Mod/PartDesign/PartDesignTests/TestChamfer.py
index 9cf5787cd5..904584bae7 100644
--- a/src/Mod/PartDesign/PartDesignTests/TestChamfer.py
+++ b/src/Mod/PartDesign/PartDesignTests/TestChamfer.py
@@ -42,6 +42,22 @@ class TestChamfer(unittest.TestCase):
         self.Doc.recompute()
         self.MajorFaces = [face for face in self.Chamfer.Shape.Faces if face.Area > 1e-3]
         self.assertEqual(len(self.MajorFaces), 8)
+        #test UseAllEdges property
+        self.Chamfer.UseAllEdges = True
+        self.Chamfer.Base = (self.Box, ['']) # no subobjects, should still work
+        self.Doc.recompute()
+        self.MajorFaces = [face for face in self.Chamfer.Shape.Faces if face.Area > 1e-3]
+        self.assertEqual(len(self.MajorFaces), 8)
+        self.Chamfer.Base = (self.Box, ['Face50']) # non-existent face, test topo naming resilience
+        self.Doc.recompute()
+        self.MajorFaces = [face for face in self.Chamfer.Shape.Faces if face.Area > 1e-3]
+        self.assertEqual(len(self.MajorFaces), 8)
+        self.Chamfer.UseAllEdges = False
+        self.Chamfer.Base = (self.Box, ['Face1'])
+        self.Doc.recompute()
+        self.MajorFaces = [face for face in self.Chamfer.Shape.Faces if face.Area > 1e-3]
+        self.assertEqual(len(self.MajorFaces), 9)
+
 
     def tearDown(self):
         #closing doc
diff --git a/src/Mod/PartDesign/PartDesignTests/TestFillet.py b/src/Mod/PartDesign/PartDesignTests/TestFillet.py
index 7edebb5858..5ec5da3c86 100644
--- a/src/Mod/PartDesign/PartDesignTests/TestFillet.py
+++ b/src/Mod/PartDesign/PartDesignTests/TestFillet.py
@@ -43,6 +43,18 @@ class TestFillet(unittest.TestCase):
         self.Body.addObject(self.Fillet)
         self.Doc.recompute()
         self.assertAlmostEqual(self.Fillet.Shape.Volume, 4/3 * pi * 5**3, places=3)
+        #test UseAllEdges property
+        self.Fillet.UseAllEdges = True
+        self.Fillet.Base = (self.Box, ['']) # no subobjects, should still work
+        self.Doc.recompute()
+        self.assertAlmostEqual(self.Fillet.Shape.Volume, 4/3 * pi * 5**3, places=3)
+        self.Fillet.Base = (self.Box, ['Face50']) # non-existent face, topo naming resilience
+        self.Doc.recompute()
+        self.assertAlmostEqual(self.Fillet.Shape.Volume, 4/3 * pi * 5**3, places=3)
+        self.Fillet.UseAllEdges = False
+        self.Fillet.Base = (self.Box, ['Face1'])
+        self.Doc.recompute()
+        self.assertNotAlmostEqual(self.Fillet.Shape.Volume, 4/3 * pi * 5**3, places=3)
 
     def tearDown(self):
         #closing doc