diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/errors.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/errors.traci
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.edg.xml b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.edg.xml
similarity index 100%
rename from sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.edg.xml
rename to sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.edg.xml
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.net.xml b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.net.xml
similarity index 100%
rename from sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.net.xml
rename to sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.net.xml
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.netccfg b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.netccfg
similarity index 100%
rename from sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.netccfg
rename to sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.netccfg
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.nod.xml b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.nod.xml
similarity index 100%
rename from sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/net.nod.xml
rename to sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/net.nod.xml
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/options.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/options.traci
new file mode 100644
index 000000000000..cca498cbe888
--- /dev/null
+++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/options.traci
@@ -0,0 +1 @@
+--vehroute-output=vehroutes.xml --no-step-log --net-file net.net.xml --route-files routes.rou.xml --remote-port 8815 TraCITestClient.exe -def testclient.prog -p 8815 -h localhost -o testclient_out.txt
\ No newline at end of file
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/output.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/output.traci
new file mode 100644
index 000000000000..9eb1ecf9aaae
--- /dev/null
+++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/output.traci
@@ -0,0 +1 @@
+***Starting server on port 8815 ***
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/routes.rou.xml b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/routes.rou.xml
similarity index 55%
rename from sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/routes.rou.xml
rename to sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/routes.rou.xml
index 92edaf15916e..23a1ad32b41c 100644
--- a/sumo/tests/traci/set_variable/Vehicle/ChangeRoute/OnInternal/routes.rou.xml
+++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/routes.rou.xml
@@ -1,8 +1,8 @@
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/routes_file.xsd">
-   <vType id="SUMO_DEFAULT_TYPE" accel="0.8" decel="4.5" sigma="0" length="3" minGap="2" maxSpeed="0.1"/>
+   <vType id="SUMO_DEFAULT_TYPE" sigma="0" maxSpeed="2"/>
 
-   <vehicle id="veh0" type="SUMO_DEFAULT_TYPE" depart="0" departPos="-1">
-       <route edges="1fi 1si 2o 2fi 2si 3o 3fi 3si 1o 1fi"/>
+   <vehicle id="veh0" type="SUMO_DEFAULT_TYPE" depart="0" departPos="-1" arrivalPos="5">
+       <route edges="1si 2o"/>
    </vehicle>
 
 </routes>
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient.prog b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient.prog
new file mode 100644
index 000000000000..4bf16c5bfcc7
--- /dev/null
+++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient.prog
@@ -0,0 +1,3 @@
+repeat 5 simstep2 0
+setvalue 0xc4 0x31 veh0 <string> 3fi
+simstep2 600
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient_out.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient_out.traci
new file mode 100644
index 000000000000..fdce40866015
--- /dev/null
+++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/testclient_out.traci
@@ -0,0 +1,162 @@
+TraCITestClient output file. Date: Mon Jul 01 13:28:01 2013
+
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <SetValue>:
+  domID=196 varID=49 objID=veh0
+.. Command acknowledged (196), [description: ]
+
+-> Command sent: <SimulationStep2>:
+.. Command acknowledged (2), [description: ]
+
+-> Command sent: <Close>:
+.. Command acknowledged (127), [description: ]
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/vehroutes.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/vehroutes.traci
new file mode 100644
index 000000000000..aa4da27f2003
--- /dev/null
+++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/OnInternal/vehroutes.traci
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 05/02/13 14:27:04 by SUMO sumo Version 0.17.0
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/sumoConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <route-files value="routes.rou.xml"/>
+    </input>
+
+    <output>
+        <netstate-dump value="netstate_dump.xml"/>
+        <vehroute-output value="vehroutes.xml"/>
+    </output>
+
+    <report>
+        <no-step-log value="true"/>
+    </report>
+
+    <traci_server>
+        <remote-port value="8815"/>
+    </traci_server>
+
+</configuration>
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo-sim.org/xsd/routes_file.xsd">
+    <vehicle id="veh0" type="vType1" depart="0.00" arrival="104.00">
+        <routeDistribution>
+            <route replacedOnEdge="e_m6" replacedAtTime="50.00" probability="0" edges="e_m5 e_m6 e_shape1 e_u1 e_u0 e_vu0"/>
+            <route edges="e_m5 e_m6 e_shape0 e_o1 e_o0 e_vo0"/>
+        </routeDistribution>
+    </vehicle>
+
+</routes>
diff --git a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/testsuite.traci b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/testsuite.traci
index 1752d454ba56..e5771d075c41 100644
--- a/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/testsuite.traci
+++ b/sumo/tests/traci/set_variable/Vehicle/ChangeTarget/testsuite.traci
@@ -1,6 +1,9 @@
 # Test basic functionality of <ChangeTarget>
 Basic
 
+# Test rerouting on an internal edge
+OnInternal
+
 # Test behaviour  when specifying unreachable target
 UnreachableTarget