diff --git a/src/Mod/Part/CMakeLists.txt b/src/Mod/Part/CMakeLists.txt
index bc28469487..b7502d6e77 100644
--- a/src/Mod/Part/CMakeLists.txt
+++ b/src/Mod/Part/CMakeLists.txt
@@ -64,6 +64,7 @@ set(CompoundTools_Scripts
 
 set(Part_tests
     parttests/__init__.py
+    parttests/Geom2d_tests.py
     parttests/part_test_objects.py
     parttests/regression_tests.py
     parttests/TopoShapeListTest.py
diff --git a/src/Mod/Part/TestPartApp.py b/src/Mod/Part/TestPartApp.py
index c22bb3e322..00e689f94e 100644
--- a/src/Mod/Part/TestPartApp.py
+++ b/src/Mod/Part/TestPartApp.py
@@ -27,6 +27,7 @@ from FreeCAD import Units
 from FreeCAD import Base
 App = FreeCAD
 
+from parttests.Geom2d_tests import Geom2dTests
 from parttests.regression_tests import RegressionTests
 from parttests.TopoShapeListTest import TopoShapeListTest
 
diff --git a/src/Mod/Part/parttests/Geom2d_tests.py b/src/Mod/Part/parttests/Geom2d_tests.py
new file mode 100644
index 0000000000..c9f8b48eaf
--- /dev/null
+++ b/src/Mod/Part/parttests/Geom2d_tests.py
@@ -0,0 +1,20 @@
+import FreeCAD
+vec2 = FreeCAD.Base.Vector2d
+import Part
+
+import unittest
+
+class Geom2dTests(unittest.TestCase):
+
+    def test_toShape(self):
+        surf = Part.Cylinder()
+
+        p1 = vec2(1.0, -1.0)
+        p2 = vec2(2.0, -1.0)
+
+        l12 = Part.Geom2d.Line2dSegment(p1, p2)
+
+        e1 = l12.toShape()
+        e2 = l12.toShape(surf)
+        self.assertNotEqual(e1.curveOnSurface(0), None)
+        self.assertNotEqual(e2.curveOnSurface(0), None)
\ No newline at end of file