diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/additionals.netedit b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/additionals.netedit
new file mode 100644
index 000000000000..ac489fbca021
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/additionals.netedit
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/datas.netedit b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/datas.netedit
new file mode 100644
index 000000000000..7f7d3ec4672d
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/datas.netedit
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/errors.netedit b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/errors.netedit
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/errors.neteditcheckoutput b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/errors.neteditcheckoutput
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/guisettingsoutput.netedit b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/guisettingsoutput.netedit
new file mode 100644
index 000000000000..aea5e11dbf3e
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/guisettingsoutput.netedit
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/log.netedit b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/log.netedit
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/meandatas.netedit b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/meandatas.netedit
new file mode 100644
index 000000000000..4817a589d55c
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/meandatas.netedit
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.con.xml b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.con.xml
new file mode 100644
index 000000000000..d44a179707c0
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.con.xml
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.edg.xml b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.edg.xml
new file mode 100644
index 000000000000..66496698bb72
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.edg.xml
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.net.xml b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.net.xml
new file mode 100644
index 000000000000..878ac2e9aea8
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.net.xml
@@ -0,0 +1,310 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.netccfg b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.netccfg
new file mode 100644
index 000000000000..89c65a96980b
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.netccfg
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.netedit b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.netedit
new file mode 100644
index 000000000000..75a34c6aabc9
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.netedit
@@ -0,0 +1,295 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.nod.xml b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.nod.xml
new file mode 100644
index 000000000000..cc7b2a65208d
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.nod.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.tll.xml b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.tll.xml
new file mode 100644
index 000000000000..ffc9f8b60360
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/net.tll.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/output.netedit b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/output.netedit
new file mode 100644
index 000000000000..cf4a9e6965e3
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/output.netedit
@@ -0,0 +1,7 @@
+TestFunctions: Netedit opened successfully
+Finding reference
+TestFunctions: 'reference.png' found. Position: 304 - 168
+TestFunctions: Clicked over position 799 - 191
+TestFunctions: Clicked over position 304 - 168
+TestFunctions: Clicked over position 304 - 168
+TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/output.neteditcheckoutput b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/output.neteditcheckoutput
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/routes.netedit b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/routes.netedit
new file mode 100644
index 000000000000..98d752d57f30
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/routes.netedit
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/test.py b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/test.py
new file mode 100644
index 000000000000..a2b4a4e7a687
--- /dev/null
+++ b/tests/netedit/network/crossings/bugs/remove_neighbor_junction_16017/test.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+# Eclipse SUMO, Simulation of Urban MObility; see https://eclipse.dev/sumo
+# Copyright (C) 2009-2025 German Aerospace Center (DLR) and others.
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/
+# This Source Code may also be made available under the following Secondary
+# Licenses when the conditions for such availability set forth in the Eclipse
+# Public License 2.0 are satisfied: GNU General Public License, version 2
+# or later which is available at
+# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+
+# @file test.py
+# @author Pablo Alvarez Lopez
+# @date 2016-11-25
+
+# import common functions for netedit tests
+import os
+import sys
+
+testRoot = os.path.join(os.environ.get('SUMO_HOME', '.'), 'tests')
+neteditTestRoot = os.path.join(
+ os.environ.get('TEXTTEST_HOME', testRoot), 'netedit')
+sys.path.append(neteditTestRoot)
+import neteditTestFunctions as netedit # noqa
+
+# Open netedit
+neteditProcess, referencePosition = netedit.setupAndStart(neteditTestRoot)
+
+# Rebuild network
+netedit.rebuildNetwork()
+
+# Change to delete
+netedit.deleteMode()
+
+# disable 'Automatically delete additionals'
+netedit.protectElements(referencePosition)
+
+# select first left edge and change their junction
+netedit.leftClick(referencePosition, netedit.positions.network.junction.cross.up)
+netedit.rebuildNetwork()
+
+# Check undo redo
+netedit.undo(referencePosition, 2)
+netedit.rebuildNetwork()
+
+# Check redo
+netedit.redo(referencePosition, 2)
+netedit.rebuildNetwork()
+
+# save routes
+netedit.saveDemandElements(True, referencePosition)
+
+# press space to fix crossings
+netedit.typeSpace()
+
+# save Netedit config
+netedit.saveNeteditConfig(referencePosition)
+
+# quit netedit
+netedit.quit(neteditProcess)
diff --git a/tests/netedit/network/crossings/bugs/testsuite.netedit b/tests/netedit/network/crossings/bugs/testsuite.netedit
index 211fed491c3a..f48c8f810714 100644
--- a/tests/netedit/network/crossings/bugs/testsuite.netedit
+++ b/tests/netedit/network/crossings/bugs/testsuite.netedit
@@ -15,3 +15,6 @@ recomputing_disable_crossings_3292
# controlled pedestrian rail crossings are lost when loading/saving with netedit
controlled_pedestrian_rail_crossings_lost_5559
+
+#Deleting one edge remove all crossings
+remove_neighbor_junction_16017
\ No newline at end of file
diff --git a/tests/netedit/network/crossings/bugs/testsuite.neteditcheckoutput b/tests/netedit/network/crossings/bugs/testsuite.neteditcheckoutput
index 211fed491c3a..f48c8f810714 100644
--- a/tests/netedit/network/crossings/bugs/testsuite.neteditcheckoutput
+++ b/tests/netedit/network/crossings/bugs/testsuite.neteditcheckoutput
@@ -15,3 +15,6 @@ recomputing_disable_crossings_3292
# controlled pedestrian rail crossings are lost when loading/saving with netedit
controlled_pedestrian_rail_crossings_lost_5559
+
+#Deleting one edge remove all crossings
+remove_neighbor_junction_16017
\ No newline at end of file