diff --git a/v2/tools/builtin.jam b/v2/tools/builtin.jam
index b5cd455af..1140c7b0f 100644
--- a/v2/tools/builtin.jam
+++ b/v2/tools/builtin.jam
@@ -53,6 +53,8 @@ feature linkflags : : free ;
 feature archiveflags : : free ;
 feature version : : free ;
 
+feature.feature location-prefix : : free ;
+
 # The following features are incidental, since
 # in themself they have no effect on build products.
 # Not making them incidental will result in problems in corner
diff --git a/v2/tools/testing.jam b/v2/tools/testing.jam
index 4a1536ce2..6744499c1 100644
--- a/v2/tools/testing.jam
+++ b/v2/tools/testing.jam
@@ -54,7 +54,6 @@ rule init ( ) { }
 # The feature which controls the name of program used to
 # lanch test programs. 
 feature.feature testing.launcher : : optional free ;
-feature.feature location-prefix : : free ;
 feature.feature test-info : : free incidental ;
 feature.feature testing.arg : : free incidental ;
 feature.feature testing.input-file : : free dependency ;