From f84f696e3110463591c4598ef1a3c95ab0fc4269 Mon Sep 17 00:00:00 2001
From: pgiraud <pierre.giraud@camptocamp.com>
Date: Mon, 21 Feb 2011 10:10:25 +0000
Subject: [PATCH] Adds the possibility to use a built version of OpenLayers for
 the tests, users simply have to add '?mode=build' in the run-tests.html url

git-svn-id: http://svn.openlayers.org/trunk/openlayers@11162 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 tests/Ajax.html                               |  2 +-
 tests/BaseTypes.html                          |  2 +-
 tests/BaseTypes/Bounds.html                   |  2 +-
 tests/BaseTypes/Class.html                    |  2 +-
 tests/BaseTypes/Element.html                  |  2 +-
 tests/BaseTypes/LonLat.html                   |  2 +-
 tests/BaseTypes/Pixel.html                    |  2 +-
 tests/BaseTypes/Size.html                     |  2 +-
 tests/Console.html                            |  2 +-
 tests/Control.html                            |  2 +-
 tests/Control/Attribution.html                |  2 +-
 tests/Control/Button.html                     |  2 +-
 tests/Control/DragFeature.html                |  2 +-
 tests/Control/DragPan.html                    |  2 +-
 tests/Control/DrawFeature.html                |  2 +-
 tests/Control/GetFeature.html                 |  2 +-
 tests/Control/Graticule.html                  |  2 +-
 tests/Control/KeyboardDefaults.html           |  2 +-
 tests/Control/LayerSwitcher.html              |  2 +-
 tests/Control/Measure.html                    |  2 +-
 tests/Control/ModifyFeature.html              |  2 +-
 tests/Control/MousePosition.html              |  2 +-
 tests/Control/MouseToolbar.html               |  2 +-
 tests/Control/NavToolbar.html                 |  2 +-
 tests/Control/Navigation.html                 |  2 +-
 tests/Control/NavigationHistory.html          |  2 +-
 tests/Control/OverviewMap.html                |  2 +-
 tests/Control/PanPanel.html                   |  2 +-
 tests/Control/PanZoom.html                    |  2 +-
 tests/Control/PanZoomBar.html                 |  2 +-
 tests/Control/Panel.html                      |  2 +-
 tests/Control/Permalink.html                  |  2 +-
 tests/Control/SLDSelect.html                  |  2 +-
 tests/Control/Scale.html                      |  2 +-
 tests/Control/ScaleLine.html                  |  2 +-
 tests/Control/SelectFeature.html              |  2 +-
 tests/Control/Snapping.html                   |  2 +-
 tests/Control/Split.html                      |  2 +-
 tests/Control/TransformFeature.html           |  2 +-
 tests/Control/WMSGetFeatureInfo.html          |  2 +-
 tests/Control/WMTSGetFeatureInfo.html         |  2 +-
 tests/Events.html                             |  2 +-
 tests/Extras.html                             |  2 +-
 tests/Feature.html                            |  2 +-
 tests/Feature/Vector.html                     |  2 +-
 tests/Filter.html                             |  2 +-
 tests/Filter/Comparison.html                  |  2 +-
 tests/Filter/FeatureId.html                   |  2 +-
 tests/Filter/Logical.html                     |  2 +-
 tests/Filter/Spatial.html                     |  2 +-
 tests/Format.html                             |  2 +-
 tests/Format/ArcXML.html                      |  2 +-
 tests/Format/ArcXML/Features.html             |  2 +-
 tests/Format/Atom.html                        |  2 +-
 tests/Format/CQL.html                         |  2 +-
 tests/Format/CSWGetDomain.html                |  2 +-
 tests/Format/CSWGetDomain/v2_0_2.html         |  2 +-
 tests/Format/CSWGetRecords.html               |  2 +-
 tests/Format/CSWGetRecords/v2_0_2.html        |  2 +-
 tests/Format/Filter.html                      |  2 +-
 tests/Format/Filter/v1.html                   |  2 +-
 tests/Format/Filter/v1_0_0.html               |  2 +-
 tests/Format/Filter/v1_1_0.html               |  2 +-
 tests/Format/GML.html                         |  2 +-
 tests/Format/GML/v2.html                      |  2 +-
 tests/Format/GML/v3.html                      |  2 +-
 tests/Format/GPX.html                         |  2 +-
 tests/Format/GeoJSON.html                     |  2 +-
 tests/Format/GeoRSS.html                      |  2 +-
 tests/Format/JSON.html                        |  2 +-
 tests/Format/KML.html                         |  2 +-
 tests/Format/OSM.html                         |  2 +-
 tests/Format/OWSContext/v0_3_1.html           |  2 +-
 tests/Format/SLD.html                         |  2 +-
 tests/Format/SLD/v1_0_0.html                  |  2 +-
 tests/Format/SOSCapabilities/v1_0_0.html      |  2 +-
 tests/Format/SOSGetFeatureOfInterest.html     |  2 +-
 tests/Format/SOSGetObservation.html           |  2 +-
 tests/Format/Text.html                        |  2 +-
 tests/Format/WFS.html                         |  2 +-
 tests/Format/WFSCapabilities.html             |  2 +-
 tests/Format/WFSCapabilities/v1.html          |  2 +-
 tests/Format/WFSDescribeFeatureType.html      |  2 +-
 tests/Format/WFST.html                        |  2 +-
 tests/Format/WFST/v1.html                     |  2 +-
 tests/Format/WFST/v1_0_0.html                 |  2 +-
 tests/Format/WFST/v1_1_0.html                 |  2 +-
 tests/Format/WKT.html                         |  2 +-
 tests/Format/WMC.html                         |  2 +-
 tests/Format/WMC/v1.html                      |  2 +-
 tests/Format/WMC/v1_1_0.html                  |  2 +-
 tests/Format/WMSCapabilities.html             |  2 +-
 tests/Format/WMSCapabilities/v1_1_1.html      |  2 +-
 tests/Format/WMSCapabilities/v1_1_1_WMSC.html |  2 +-
 tests/Format/WMSCapabilities/v1_3_0.html      |  2 +-
 tests/Format/WMSDescribeLayer.html            |  2 +-
 tests/Format/WMSGetFeatureInfo.html           |  2 +-
 tests/Format/WMTSCapabilities.html            |  2 +-
 tests/Format/WMTSCapabilities/v1_0_0.html     |  2 +-
 tests/Format/XML.html                         |  2 +-
 tests/Geometry.html                           |  2 +-
 tests/Geometry/Collection.html                |  2 +-
 tests/Geometry/Curve.html                     |  2 +-
 tests/Geometry/LineString.html                |  2 +-
 tests/Geometry/LinearRing.html                |  2 +-
 tests/Geometry/MultiLineString.html           |  2 +-
 tests/Geometry/MultiPoint.html                |  2 +-
 tests/Geometry/MultiPolygon.html              |  2 +-
 tests/Geometry/Point.html                     |  2 +-
 tests/Geometry/Polygon.html                   |  2 +-
 tests/Geometry/Rectangle.html                 |  2 +-
 tests/Geometry/Surface.html                   |  2 +-
 tests/Handler.html                            |  2 +-
 tests/Handler/Box.html                        |  2 +-
 tests/Handler/Click.html                      |  2 +-
 tests/Handler/Drag.html                       |  2 +-
 tests/Handler/Feature.html                    |  2 +-
 tests/Handler/Hover.html                      |  2 +-
 tests/Handler/Keyboard.html                   |  2 +-
 tests/Handler/MouseWheel.html                 |  2 +-
 tests/Handler/Path.html                       |  2 +-
 tests/Handler/Point.html                      |  2 +-
 tests/Handler/Polygon.html                    |  2 +-
 tests/Handler/RegularPolygon.html             |  2 +-
 tests/Icon.html                               |  2 +-
 tests/Lang.html                               |  2 +-
 tests/Layer.html                              |  2 +-
 tests/Layer/ArcGIS93Rest.html                 |  2 +-
 tests/Layer/ArcIMS.html                       |  2 +-
 tests/Layer/Bing.html                         |  2 +-
 tests/Layer/EventPane.html                    |  2 +-
 tests/Layer/FixedZoomLevels.html              |  2 +-
 tests/Layer/GML.html                          |  2 +-
 tests/Layer/GeoRSS.html                       |  2 +-
 tests/Layer/Google.html                       |  2 +-
 tests/Layer/Google/v3.html                    |  2 +-
 tests/Layer/Grid.html                         |  2 +-
 tests/Layer/HTTPRequest.html                  |  2 +-
 tests/Layer/Image.html                        |  2 +-
 tests/Layer/KaMap.html                        |  2 +-
 tests/Layer/MapGuide.html                     |  2 +-
 tests/Layer/MapServer.html                    |  2 +-
 tests/Layer/Markers.html                      |  2 +-
 tests/Layer/MultiMap.html                     |  2 +-
 tests/Layer/PointTrack.html                   |  2 +-
 tests/Layer/SphericalMercator.html            |  2 +-
 tests/Layer/TMS.html                          |  2 +-
 tests/Layer/Text.html                         |  2 +-
 tests/Layer/TileCache.html                    |  2 +-
 tests/Layer/Vector.html                       |  2 +-
 tests/Layer/Vector/RootContainer.html         |  2 +-
 tests/Layer/WFS.html                          |  2 +-
 tests/Layer/WMS.html                          |  2 +-
 tests/Layer/WMS/Post.html                     |  2 +-
 tests/Layer/WMTS.html                         |  2 +-
 tests/Layer/WrapDateLine.html                 |  2 +-
 tests/Layer/XYZ.html                          |  2 +-
 tests/Layer/Yahoo.html                        |  2 +-
 tests/Map.html                                |  2 +-
 tests/Marker.html                             |  2 +-
 tests/Marker/Box.html                         |  2 +-
 tests/OLLoader.js                             | 11 +++++++++++
 tests/OpenLayers1.html                        |  2 +-
 tests/OpenLayers2.html                        |  2 +-
 tests/OpenLayers3.html                        |  2 +-
 tests/OpenLayers4.html                        |  2 +-
 tests/OpenLayersJsFiles.html                  |  2 +-
 tests/Popup.html                              |  2 +-
 tests/Popup/Anchored.html                     |  2 +-
 tests/Popup/AnchoredBubble.html               |  2 +-
 tests/Popup/FramedCloud.html                  |  2 +-
 tests/Projection.html                         |  2 +-
 tests/Protocol.html                           |  2 +-
 tests/Protocol/HTTP.html                      |  2 +-
 tests/Protocol/SOS.html                       |  2 +-
 tests/Protocol/SQL.html                       |  2 +-
 tests/Protocol/SQL/Gears.html                 |  2 +-
 tests/Protocol/WFS.html                       |  2 +-
 tests/Renderer.html                           |  2 +-
 tests/Renderer/Canvas.html                    |  2 +-
 tests/Renderer/Elements.html                  |  2 +-
 tests/Renderer/SVG.html                       |  2 +-
 tests/Renderer/VML.html                       |  2 +-
 tests/Request.html                            |  2 +-
 tests/Request/XMLHttpRequest.html             |  2 +-
 tests/Rule.html                               |  2 +-
 tests/Strategy.html                           |  2 +-
 tests/Strategy/BBOX.html                      |  2 +-
 tests/Strategy/Cluster.html                   |  2 +-
 tests/Strategy/Filter.html                    |  2 +-
 tests/Strategy/Fixed.html                     |  2 +-
 tests/Strategy/Paging.html                    |  2 +-
 tests/Strategy/Refresh.html                   |  2 +-
 tests/Strategy/Save.html                      |  2 +-
 tests/Style.html                              |  2 +-
 tests/Style2.html                             |  2 +-
 tests/StyleMap.html                           |  2 +-
 tests/Symbolizer.html                         |  2 +-
 tests/Symbolizer/Line.html                    |  2 +-
 tests/Symbolizer/Point.html                   |  2 +-
 tests/Symbolizer/Polygon.html                 |  2 +-
 tests/Symbolizer/Raster.html                  |  2 +-
 tests/Symbolizer/Text.html                    |  2 +-
 tests/Tile.html                               |  2 +-
 tests/Tile/Image.html                         |  2 +-
 tests/Tile/Image/IFrame.html                  |  2 +-
 tests/Tile/WFS.html                           |  2 +-
 tests/Tween.html                              |  2 +-
 tests/Util.html                               |  2 +-
 209 files changed, 219 insertions(+), 208 deletions(-)
 create mode 100644 tests/OLLoader.js

diff --git a/tests/Ajax.html b/tests/Ajax.html
index 7608bc182e..53142a2dcb 100644
--- a/tests/Ajax.html
+++ b/tests/Ajax.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_Ajax_loadUrl(t) {
diff --git a/tests/BaseTypes.html b/tests/BaseTypes.html
index c17d686c9d..55e7eac99b 100644
--- a/tests/BaseTypes.html
+++ b/tests/BaseTypes.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_String_startsWith(t) {
diff --git a/tests/BaseTypes/Bounds.html b/tests/BaseTypes/Bounds.html
index 6713ccc5e9..2e185f710c 100644
--- a/tests/BaseTypes/Bounds.html
+++ b/tests/BaseTypes/Bounds.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var bounds; 
     function test_Bounds_constructor (t) {
diff --git a/tests/BaseTypes/Class.html b/tests/BaseTypes/Class.html
index bcf827e80f..17a038c450 100644
--- a/tests/BaseTypes/Class.html
+++ b/tests/BaseTypes/Class.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     // remove this next line at 3.0
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
diff --git a/tests/BaseTypes/Element.html b/tests/BaseTypes/Element.html
index 8e24e8c358..ca95d78c18 100644
--- a/tests/BaseTypes/Element.html
+++ b/tests/BaseTypes/Element.html
@@ -1,7 +1,7 @@
 <html>
   <head>
   
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
 
     <script type="text/javascript">
 
diff --git a/tests/BaseTypes/LonLat.html b/tests/BaseTypes/LonLat.html
index 400d30b409..0861be71d0 100644
--- a/tests/BaseTypes/LonLat.html
+++ b/tests/BaseTypes/LonLat.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     var lonlat; 
diff --git a/tests/BaseTypes/Pixel.html b/tests/BaseTypes/Pixel.html
index c9da789ac2..5f448dcd57 100644
--- a/tests/BaseTypes/Pixel.html
+++ b/tests/BaseTypes/Pixel.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var pixel; 
     
diff --git a/tests/BaseTypes/Size.html b/tests/BaseTypes/Size.html
index ab0c277fad..b52906c608 100644
--- a/tests/BaseTypes/Size.html
+++ b/tests/BaseTypes/Size.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var Size; 
     
diff --git a/tests/Console.html b/tests/Console.html
index aac38a2593..48b27c2a6d 100644
--- a/tests/Console.html
+++ b/tests/Console.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
     function test_Console(t) {
         
diff --git a/tests/Control.html b/tests/Control.html
index a94426f2b5..1d18a4cf00 100644
--- a/tests/Control.html
+++ b/tests/Control.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
     function test_Control_constructor(t) {
         t.plan(4);
diff --git a/tests/Control/Attribution.html b/tests/Control/Attribution.html
index f4f0aa6e31..c1c1ef228b 100644
--- a/tests/Control/Attribution.html
+++ b/tests/Control/Attribution.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map; 
     function test_Control_Attribution_constructor (t) {
diff --git a/tests/Control/Button.html b/tests/Control/Button.html
index 925e621550..8d5c0364fa 100644
--- a/tests/Control/Button.html
+++ b/tests/Control/Button.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
       function test_Control_Button_constructor (t) {
           t.plan( 2 );
diff --git a/tests/Control/DragFeature.html b/tests/Control/DragFeature.html
index 1c7e6d085b..b83ec88559 100644
--- a/tests/Control/DragFeature.html
+++ b/tests/Control/DragFeature.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     function test_Control_DragFeature_constructor(t) {
         t.plan(3);
diff --git a/tests/Control/DragPan.html b/tests/Control/DragPan.html
index def6bd6f8b..ba5224fe5e 100644
--- a/tests/Control/DragPan.html
+++ b/tests/Control/DragPan.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map, control, layer; 
 
diff --git a/tests/Control/DrawFeature.html b/tests/Control/DrawFeature.html
index 63cff1e7db..ae2f8effa2 100644
--- a/tests/Control/DrawFeature.html
+++ b/tests/Control/DrawFeature.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Control/GetFeature.html b/tests/Control/GetFeature.html
index d0a3060233..bbdd0e47af 100644
--- a/tests/Control/GetFeature.html
+++ b/tests/Control/GetFeature.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     function test_Control_GetFeature_constructor(t) {
         t.plan(3);
diff --git a/tests/Control/Graticule.html b/tests/Control/Graticule.html
index 0001d2d7bd..96f0104b52 100644
--- a/tests/Control/Graticule.html
+++ b/tests/Control/Graticule.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script src="http://proj4js.org/lib/proj4js-compressed.js"></script>
     <script type="text/javascript">
 
diff --git a/tests/Control/KeyboardDefaults.html b/tests/Control/KeyboardDefaults.html
index 0f83f47d15..4d894183db 100644
--- a/tests/Control/KeyboardDefaults.html
+++ b/tests/Control/KeyboardDefaults.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map; 
     function test_Control_KeyboardDefaults_constructor (t) {
diff --git a/tests/Control/LayerSwitcher.html b/tests/Control/LayerSwitcher.html
index 40dded5a4e..4af355f795 100644
--- a/tests/Control/LayerSwitcher.html
+++ b/tests/Control/LayerSwitcher.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map; 
 
diff --git a/tests/Control/Measure.html b/tests/Control/Measure.html
index 240d1ae362..62a84d7094 100644
--- a/tests/Control/Measure.html
+++ b/tests/Control/Measure.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialze(t) {
diff --git a/tests/Control/ModifyFeature.html b/tests/Control/ModifyFeature.html
index e8b49f35aa..a3259dd023 100644
--- a/tests/Control/ModifyFeature.html
+++ b/tests/Control/ModifyFeature.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_initialize(t) {
diff --git a/tests/Control/MousePosition.html b/tests/Control/MousePosition.html
index 2858167d29..0695e16e1f 100644
--- a/tests/Control/MousePosition.html
+++ b/tests/Control/MousePosition.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map, control; 
     function test_initialize (t) {
diff --git a/tests/Control/MouseToolbar.html b/tests/Control/MouseToolbar.html
index e4799edae1..97baa4ad7f 100644
--- a/tests/Control/MouseToolbar.html
+++ b/tests/Control/MouseToolbar.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map; 
     function test_Control_MouseToolbar_constructor (t) {
diff --git a/tests/Control/NavToolbar.html b/tests/Control/NavToolbar.html
index 9bf41c9748..8a39604345 100644
--- a/tests/Control/NavToolbar.html
+++ b/tests/Control/NavToolbar.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map; 
     function test_Control_NavToolbar_constructor (t) {
diff --git a/tests/Control/Navigation.html b/tests/Control/Navigation.html
index 7569eb5ff0..4a2507f0c3 100644
--- a/tests/Control/Navigation.html
+++ b/tests/Control/Navigation.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_Control_Navigation_constructor (t) {
diff --git a/tests/Control/NavigationHistory.html b/tests/Control/NavigationHistory.html
index cccf4b8d9e..b766b0e5ae 100644
--- a/tests/Control/NavigationHistory.html
+++ b/tests/Control/NavigationHistory.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Control/OverviewMap.html b/tests/Control/OverviewMap.html
index 3feaa87692..fce7a24d28 100644
--- a/tests/Control/OverviewMap.html
+++ b/tests/Control/OverviewMap.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map, control;
     function test_initialize(t) {
diff --git a/tests/Control/PanPanel.html b/tests/Control/PanPanel.html
index 0c643be523..978a051f65 100644
--- a/tests/Control/PanPanel.html
+++ b/tests/Control/PanPanel.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_constructor (t) {
         t.plan(2);
diff --git a/tests/Control/PanZoom.html b/tests/Control/PanZoom.html
index f08fe0d07d..1d96b3ee10 100644
--- a/tests/Control/PanZoom.html
+++ b/tests/Control/PanZoom.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map; 
     function test_Control_PanZoom_constructor (t) {
diff --git a/tests/Control/PanZoomBar.html b/tests/Control/PanZoomBar.html
index 9590dd08b1..43d0b3b8b0 100644
--- a/tests/Control/PanZoomBar.html
+++ b/tests/Control/PanZoomBar.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map;
     function test_Control_PanZoomBar_constructor (t) {
diff --git a/tests/Control/Panel.html b/tests/Control/Panel.html
index 31c4ab6a19..11355f2df9 100644
--- a/tests/Control/Panel.html
+++ b/tests/Control/Panel.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Control_Panel_constructor (t) {
         t.plan( 2 );
diff --git a/tests/Control/Permalink.html b/tests/Control/Permalink.html
index c42d2039d2..e052c8971c 100644
--- a/tests/Control/Permalink.html
+++ b/tests/Control/Permalink.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map; 
     function test_Control_Permalink_constructor (t) {
diff --git a/tests/Control/SLDSelect.html b/tests/Control/SLDSelect.html
index a11d6c632a..41958c23c5 100644
--- a/tests/Control/SLDSelect.html
+++ b/tests/Control/SLDSelect.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Control/Scale.html b/tests/Control/Scale.html
index 7010661c92..182e94cc66 100644
--- a/tests/Control/Scale.html
+++ b/tests/Control/Scale.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map; 
     function test_Control_Scale_constructor (t) {
diff --git a/tests/Control/ScaleLine.html b/tests/Control/ScaleLine.html
index 3a3e8aca4e..e863fd95a0 100644
--- a/tests/Control/ScaleLine.html
+++ b/tests/Control/ScaleLine.html
@@ -3,7 +3,7 @@
     <script type="text/javascript">var oldAlert = window.alert, gMess; window.alert = function(message) {gMess = message; return true;};</script>
     <!-- this gmaps key generated for http://openlayers.org/dev/ -->
     <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAA9XNhd8q0UdwNC7YSO4YZghSPUCi5aRYVveCcVYxzezM4iaj_gxQ9t-UajFL70jfcpquH5l1IJ-Zyyw'></script>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
   var validkey = (window.location.protocol == "file:") ||
                  (window.location.host == "localhost") ||
diff --git a/tests/Control/SelectFeature.html b/tests/Control/SelectFeature.html
index 42cca0b0b1..15ff677df6 100644
--- a/tests/Control/SelectFeature.html
+++ b/tests/Control/SelectFeature.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     function test_Control_SelectFeature_constructor(t) {
         t.plan(5);
diff --git a/tests/Control/Snapping.html b/tests/Control/Snapping.html
index 38e77704cc..a0c55c240b 100644
--- a/tests/Control/Snapping.html
+++ b/tests/Control/Snapping.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Control/Split.html b/tests/Control/Split.html
index 0e4df0b8e5..339ee3bd54 100644
--- a/tests/Control/Split.html
+++ b/tests/Control/Split.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Control/TransformFeature.html b/tests/Control/TransformFeature.html
index 44a53e1247..2f6b1c1f26 100644
--- a/tests/Control/TransformFeature.html
+++ b/tests/Control/TransformFeature.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Control/WMSGetFeatureInfo.html b/tests/Control/WMSGetFeatureInfo.html
index 6ed080d000..dea4b8a41e 100644
--- a/tests/Control/WMSGetFeatureInfo.html
+++ b/tests/Control/WMSGetFeatureInfo.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Control/WMTSGetFeatureInfo.html b/tests/Control/WMTSGetFeatureInfo.html
index 14597d53ff..c7be78ca03 100644
--- a/tests/Control/WMTSGetFeatureInfo.html
+++ b/tests/Control/WMTSGetFeatureInfo.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Events.html b/tests/Events.html
index 24bed698f3..8efd115a10 100644
--- a/tests/Events.html
+++ b/tests/Events.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var map; 
diff --git a/tests/Extras.html b/tests/Extras.html
index 38ed2b70b8..264eb0f035 100644
--- a/tests/Extras.html
+++ b/tests/Extras.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
 
     var map;
diff --git a/tests/Feature.html b/tests/Feature.html
index e6de47f60c..c96a43f787 100644
--- a/tests/Feature.html
+++ b/tests/Feature.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var map; 
diff --git a/tests/Feature/Vector.html b/tests/Feature/Vector.html
index 2cf0d18b26..59b0abbaa5 100644
--- a/tests/Feature/Vector.html
+++ b/tests/Feature/Vector.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map; 
     var feature; 
diff --git a/tests/Filter.html b/tests/Filter.html
index b981d20d8d..25b0e94377 100644
--- a/tests/Filter.html
+++ b/tests/Filter.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../lib/OpenLayers.js"></script> 
+    <script src="OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_initialize(t) { 
diff --git a/tests/Filter/Comparison.html b/tests/Filter/Comparison.html
index b9505dbb04..a0c2da35be 100644
--- a/tests/Filter/Comparison.html
+++ b/tests/Filter/Comparison.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_initialize(t) { 
diff --git a/tests/Filter/FeatureId.html b/tests/Filter/FeatureId.html
index 0adeba7a93..8c20192180 100644
--- a/tests/Filter/FeatureId.html
+++ b/tests/Filter/FeatureId.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_initialize(t) { 
diff --git a/tests/Filter/Logical.html b/tests/Filter/Logical.html
index cfbc93bb8c..187cf5b49d 100644
--- a/tests/Filter/Logical.html
+++ b/tests/Filter/Logical.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_initialize(t) { 
diff --git a/tests/Filter/Spatial.html b/tests/Filter/Spatial.html
index 69ed1f20c4..558f924c37 100644
--- a/tests/Filter/Spatial.html
+++ b/tests/Filter/Spatial.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_constructor(t) { 
diff --git a/tests/Format.html b/tests/Format.html
index 9c761dff28..66d2696469 100644
--- a/tests/Format.html
+++ b/tests/Format.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_Format_constructor(t) {
diff --git a/tests/Format/ArcXML.html b/tests/Format/ArcXML.html
index 6298e7ce27..ea7d273c0e 100644
--- a/tests/Format/ArcXML.html
+++ b/tests/Format/ArcXML.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
 
     var axl_image_response = '<?xml version="1.0" encoding="UTF-8"?><ARCXML version="1.1"><RESPONSE><IMAGE><ENVELOPE minx="-2471.42857142857" miny="0" maxx="105671.428571429" maxy="75700" /><OUTPUT url="http://localhost/output/364826560.png" /></IMAGE></RESPONSE></ARCXML>';
diff --git a/tests/Format/ArcXML/Features.html b/tests/Format/ArcXML/Features.html
index d971017515..bd2f680657 100644
--- a/tests/Format/ArcXML/Features.html
+++ b/tests/Format/ArcXML/Features.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
     
     var axl_feature_response = '<?xml version="1.0" encoding="Cp1252"?><ARCXML version="1.1"><RESPONSE><FEATURES><FEATURE><FIELDS><FIELD name="UNIQUE_ID" value="514504b5-0458-461d-b540-8e18a454f619" /><FIELD name="LABEL" value="LIBRARY" /><FIELD name="Y_COORD" value="39.57" /><FIELD name="X_COORD" value="-104.24" /><FIELD name="#SHAPE#" value="[Geometry]" /><FIELD name="OBJECTID" value="1" /><FIELD name="shape.area" value="0" /><FIELD name="shape.len" value="0" /></FIELDS></FEATURE><FEATURE><FIELDS><FIELD name="UNIQUE_ID" value="514504b5-0458-461d-b540-8e81a454f619" /><FIELD name="LABEL" value="LIBRARY2" /><FIELD name="Y_COORD" value="39.75" /><FIELD name="X_COORD" value="-104.42" /><FIELD name="#SHAPE#" value="[Geometry]" /><FIELD name="OBJECTID" value="2" /><FIELD name="shape.area" value="0" /><FIELD name="shape.len" value="0" /></FIELDS></FEATURE><FEATURECOUNT count="2" hasmore="false" /><ENVELOPE minx="-678853.220047791" miny="1810.22081371862" maxx="-678853.220047791" maxy="1810.22081371862"/></FEATURES></RESPONSE></ARCXML>';
diff --git a/tests/Format/Atom.html b/tests/Format/Atom.html
index 52ee26585a..71bccc5ae9 100644
--- a/tests/Format/Atom.html
+++ b/tests/Format/Atom.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_constructor(t) { 
diff --git a/tests/Format/CQL.html b/tests/Format/CQL.html
index c813bfdfd7..a1c65ee0d6 100644
--- a/tests/Format/CQL.html
+++ b/tests/Format/CQL.html
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src="../../lib/OpenLayers.js"></script>
+        <script src="../OLLoader.js"></script>
 
         <script type="text/javascript">
 
diff --git a/tests/Format/CSWGetDomain.html b/tests/Format/CSWGetDomain.html
index 852989fe30..1e378265c8 100644
--- a/tests/Format/CSWGetDomain.html
+++ b/tests/Format/CSWGetDomain.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Format/CSWGetDomain/v2_0_2.html b/tests/Format/CSWGetDomain/v2_0_2.html
index 81c51c5264..ea0be83e60 100644
--- a/tests/Format/CSWGetDomain/v2_0_2.html
+++ b/tests/Format/CSWGetDomain/v2_0_2.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script src="v2_0_2.js"></script>
     <script type="text/javascript">
 
diff --git a/tests/Format/CSWGetRecords.html b/tests/Format/CSWGetRecords.html
index f2f183b6b8..2b8bc6b33b 100644
--- a/tests/Format/CSWGetRecords.html
+++ b/tests/Format/CSWGetRecords.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Format/CSWGetRecords/v2_0_2.html b/tests/Format/CSWGetRecords/v2_0_2.html
index e32383e254..0556ba05c5 100644
--- a/tests/Format/CSWGetRecords/v2_0_2.html
+++ b/tests/Format/CSWGetRecords/v2_0_2.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script src="v2_0_2.js"></script>
     <script type="text/javascript">
 
diff --git a/tests/Format/Filter.html b/tests/Format/Filter.html
index 08866bd1c2..69a05647ea 100644
--- a/tests/Format/Filter.html
+++ b/tests/Format/Filter.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_initialize(t) { 
diff --git a/tests/Format/Filter/v1.html b/tests/Format/Filter/v1.html
index f2bdbb7286..a499c93d6b 100644
--- a/tests/Format/Filter/v1.html
+++ b/tests/Format/Filter/v1.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_PropertyIsBetween(t) {
diff --git a/tests/Format/Filter/v1_0_0.html b/tests/Format/Filter/v1_0_0.html
index 8aab3d76ac..f69bfb0381 100644
--- a/tests/Format/Filter/v1_0_0.html
+++ b/tests/Format/Filter/v1_0_0.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
     
     var test_xml =
diff --git a/tests/Format/Filter/v1_1_0.html b/tests/Format/Filter/v1_1_0.html
index 796a903dfd..ddfe99edfc 100644
--- a/tests/Format/Filter/v1_1_0.html
+++ b/tests/Format/Filter/v1_1_0.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
     
     var test_xml =
diff --git a/tests/Format/GML.html b/tests/Format/GML.html
index 45aaa6c18f..43b8fbdde0 100644
--- a/tests/Format/GML.html
+++ b/tests/Format/GML.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_Format_GML_constructor(t) { 
diff --git a/tests/Format/GML/v2.html b/tests/Format/GML/v2.html
index 48f6abe534..3ce540ff53 100644
--- a/tests/Format/GML/v2.html
+++ b/tests/Format/GML/v2.html
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml"> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script src="cases.js"></script>
     <script type="text/javascript">
 
diff --git a/tests/Format/GML/v3.html b/tests/Format/GML/v3.html
index 4d452fc781..9858b94491 100644
--- a/tests/Format/GML/v3.html
+++ b/tests/Format/GML/v3.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script src="cases.js"></script>
     <script type="text/javascript">
 
diff --git a/tests/Format/GPX.html b/tests/Format/GPX.html
index 7bf56ec80a..0bf897d8d7 100644
--- a/tests/Format/GPX.html
+++ b/tests/Format/GPX.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     
     var gpx_data = '<?xml version="1.0" encoding="ISO-8859-1"?><gpx version="1.1" creator="Memory-Map 5.1.3.715 http://www.memory-map.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"><wpt lat="51.3697845627" lon="-0.1853562259"><name>Mark</name><sym><![CDATA[Flag]]></sym><type><![CDATA[Marks]]></type></wpt><rte><name><![CDATA[Route8]]></name><type><![CDATA[Route]]></type><rtept lat="51.3761803674" lon="-0.1829991904"><name><![CDATA[WP0801]]></name><sym><![CDATA[Dot]]></sym><type><![CDATA[Waypoints]]></type></rtept><rtept lat="51.3697894659" lon="-0.1758887005"><name><![CDATA[WP0802]]></name><sym><![CDATA[Dot]]></sym><type><![CDATA[Waypoints]]></type></rtept><rtept lat="51.3639790884" lon="-0.1833202965"><name><![CDATA[WP0803]]></name><sym><![CDATA[Dot]]></sym><type><![CDATA[Waypoints]]></type></rtept><rtept lat="51.3567607069" lon="-0.1751119509"><name><![CDATA[WP0804]]></name><sym><![CDATA[Dot]]></sym><type><![CDATA[Waypoints]]></type></rtept></rte><trk><name><![CDATA[Track]]></name><type><![CDATA[Track]]></type><trkseg><trkpt lat="51.3768216433" lon="-0.1721292044"></trkpt><trkpt lat="51.3708337670" lon="-0.1649230916"></trkpt><trkpt lat="51.3644368725" lon="-0.1736741378"></trkpt><trkpt lat="51.3576354272" lon="-0.1662595250"></trkpt></trkseg></trk></gpx>';
diff --git a/tests/Format/GeoJSON.html b/tests/Format/GeoJSON.html
index db3dd7c278..f6393462df 100644
--- a/tests/Format/GeoJSON.html
+++ b/tests/Format/GeoJSON.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     var poly_content = '{"type": "FeatureCollection", "features": [{"geometry": {"type": "Polygon", "coordinates": [[[-131.484375, -5.9765625], [-112.5, -58.0078125], [-32.34375, -50.2734375], [-114.609375, 52.3828125], [-167.34375, -35.5078125], [-146.953125, -57.3046875], [-139.921875, -34.1015625], [-131.484375, -5.9765625]]]}, "type": "Feature", "id": 562, "properties": {"strokeColor": "red", "title": "Feature 2", "author": "Your Name Here"}}]}'; 
diff --git a/tests/Format/GeoRSS.html b/tests/Format/GeoRSS.html
index 8a4665aa61..95d3ba99d9 100644
--- a/tests/Format/GeoRSS.html
+++ b/tests/Format/GeoRSS.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_Format_GeoRSS_constructor(t) { 
diff --git a/tests/Format/JSON.html b/tests/Format/JSON.html
index 0bdbb6fed2..84461e19f4 100644
--- a/tests/Format/JSON.html
+++ b/tests/Format/JSON.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_Format_JSON_constructor(t) { 
diff --git a/tests/Format/KML.html b/tests/Format/KML.html
index 018aaeda84..6056ee12fd 100644
--- a/tests/Format/KML.html
+++ b/tests/Format/KML.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     var test_content = '<kml xmlns="http://earth.google.com/kml/2.0"><Folder><name>OpenLayers export</name><description>Vector geometries from OpenLayers</description><Placemark id="KML.Polygon"><name>OpenLayers.Feature.Vector_344</name><description>A KLM Polygon</description><Polygon><outerBoundaryIs><LinearRing><coordinates>5.001370157823406,49.26855713824488 8.214706453896161,49.630662409673505 8.397385910100951,48.45172350357396 5.001370157823406,49.26855713824488</coordinates></LinearRing></outerBoundaryIs></Polygon></Placemark><Placemark id="KML.LineString"><name>OpenLayers.Feature.Vector_402</name><description>A KML LineString</description><LineString><coordinates>5.838523393080493,49.74814616928052 5.787079558782349,48.410795432216574 8.91427702008381,49.28932499608202</coordinates></LineString></Placemark><Placemark id="KML.Point"><name>OpenLayers.Feature.Vector_451</name><description>A KML Point</description><Point><coordinates>6.985073041685488,49.8682250149058</coordinates></Point></Placemark><Placemark id="KML.MultiGeometry"><name>SF Marina Harbor Master</name><description>KML MultiGeometry</description><MultiGeometry><LineString><coordinates>-122.4425587930444,37.80666418607323 -122.4428379594768,37.80663578323093</coordinates></LineString><LineString><coordinates>-122.4425509770566,37.80662588061205 -122.4428340530617,37.8065999493009</coordinates></LineString></MultiGeometry></Placemark></Folder></kml>';
diff --git a/tests/Format/OSM.html b/tests/Format/OSM.html
index 1c3c9f9fde..e2509ae9bf 100644
--- a/tests/Format/OSM.html
+++ b/tests/Format/OSM.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script src="../data/osm.js"></script> 
     <script type="text/javascript">
     
diff --git a/tests/Format/OWSContext/v0_3_1.html b/tests/Format/OWSContext/v0_3_1.html
index cc7d1dccba..6f5b0bb1dc 100644
--- a/tests/Format/OWSContext/v0_3_1.html
+++ b/tests/Format/OWSContext/v0_3_1.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
 
     function test_read_wmswfs(t) {
diff --git a/tests/Format/SLD.html b/tests/Format/SLD.html
index d63798b31d..bc4bd822a8 100644
--- a/tests/Format/SLD.html
+++ b/tests/Format/SLD.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     var test_content = '<sld:StyledLayerDescriptor xmlns:sld="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml"><sld:NamedLayer><sld:Name>TestLayer</sld:Name><sld:UserStyle><sld:Name>foo</sld:Name><sld:FeatureTypeStyle><sld:Rule><sld:Name>bar</sld:Name><ogc:Filter></ogc:Filter><sld:PolygonSymbolizer><sld:Fill><sld:CssParameter name="fill"><ogc:Literal>blue</ogc:Literal></sld:CssParameter></sld:Fill></sld:PolygonSymbolizer></sld:Rule></sld:FeatureTypeStyle></sld:UserStyle></sld:NamedLayer></sld:StyledLayerDescriptor>';
diff --git a/tests/Format/SLD/v1_0_0.html b/tests/Format/SLD/v1_0_0.html
index 6cb604b82f..16bf51d509 100644
--- a/tests/Format/SLD/v1_0_0.html
+++ b/tests/Format/SLD/v1_0_0.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
 
     var xml = new OpenLayers.Format.XML(); 
diff --git a/tests/Format/SOSCapabilities/v1_0_0.html b/tests/Format/SOSCapabilities/v1_0_0.html
index 7b13185e3a..ed7f25eb65 100644
--- a/tests/Format/SOSCapabilities/v1_0_0.html
+++ b/tests/Format/SOSCapabilities/v1_0_0.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script src="v1_0_0.js"></script>
     <script type="text/javascript">
 
diff --git a/tests/Format/SOSGetFeatureOfInterest.html b/tests/Format/SOSGetFeatureOfInterest.html
index 87b45094fe..c80078f2d1 100644
--- a/tests/Format/SOSGetFeatureOfInterest.html
+++ b/tests/Format/SOSGetFeatureOfInterest.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
 
     function test_read_SOSGetFeatureOfInterest_single(t) {
diff --git a/tests/Format/SOSGetObservation.html b/tests/Format/SOSGetObservation.html
index 405f0e6d8f..3256d5a52f 100644
--- a/tests/Format/SOSGetObservation.html
+++ b/tests/Format/SOSGetObservation.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
 
     function test_read_SOSGetObservation(t) {
diff --git a/tests/Format/Text.html b/tests/Format/Text.html
index 2b46ced510..3e4e8160bb 100644
--- a/tests/Format/Text.html
+++ b/tests/Format/Text.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
     function test_basic(t) {
         t.plan(5);
diff --git a/tests/Format/WFS.html b/tests/Format/WFS.html
index 113e219f11..7b3b737dbf 100644
--- a/tests/Format/WFS.html
+++ b/tests/Format/WFS.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script>  
     function test_wfs_update_node(t) {
         t.plan(2);
diff --git a/tests/Format/WFSCapabilities.html b/tests/Format/WFSCapabilities.html
index 7de3397869..4e6545e160 100644
--- a/tests/Format/WFSCapabilities.html
+++ b/tests/Format/WFSCapabilities.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_read(t) {
diff --git a/tests/Format/WFSCapabilities/v1.html b/tests/Format/WFSCapabilities/v1.html
index a22f03af43..74a031fc50 100644
--- a/tests/Format/WFSCapabilities/v1.html
+++ b/tests/Format/WFSCapabilities/v1.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_read(t) {
diff --git a/tests/Format/WFSDescribeFeatureType.html b/tests/Format/WFSDescribeFeatureType.html
index d191d4f589..53faa5d584 100644
--- a/tests/Format/WFSDescribeFeatureType.html
+++ b/tests/Format/WFSDescribeFeatureType.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_read_WFSDescribeFeatureType(t) {
diff --git a/tests/Format/WFST.html b/tests/Format/WFST.html
index e6793c0f85..9623b05737 100644
--- a/tests/Format/WFST.html
+++ b/tests/Format/WFST.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Format/WFST/v1.html b/tests/Format/WFST/v1.html
index c1b590f135..9a01e7f6ae 100644
--- a/tests/Format/WFST/v1.html
+++ b/tests/Format/WFST/v1.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../../lib/OpenLayers.js"></script>
+  <script src="../../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_read(t) {
diff --git a/tests/Format/WFST/v1_0_0.html b/tests/Format/WFST/v1_0_0.html
index 6f807fd93f..bd67071ceb 100644
--- a/tests/Format/WFST/v1_0_0.html
+++ b/tests/Format/WFST/v1_0_0.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../../lib/OpenLayers.js"></script>
+  <script src="../../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Format/WFST/v1_1_0.html b/tests/Format/WFST/v1_1_0.html
index b66ede1120..62a95710ee 100644
--- a/tests/Format/WFST/v1_1_0.html
+++ b/tests/Format/WFST/v1_1_0.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../../lib/OpenLayers.js"></script>
+  <script src="../../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Format/WKT.html b/tests/Format/WKT.html
index 1dce0d897c..75fd472c61 100644
--- a/tests/Format/WKT.html
+++ b/tests/Format/WKT.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
      
     var points = []; 
diff --git a/tests/Format/WMC.html b/tests/Format/WMC.html
index a48dd4b6d7..33a7a34cf3 100644
--- a/tests/Format/WMC.html
+++ b/tests/Format/WMC.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     var v1_0_0 = '<ViewContext xmlns="http://www.opengis.net/context" version="1.0.0" id="OpenLayers_Context_233" xsi:schemaLocation="http://www.opengis.net/context http://schemas.opengis.net/context/1.0.0/context.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><General><Window width="512" height="256"/><BoundingBox minx="-109.9709708" miny="27.01451459" maxx="-80.02902918" maxy="41.98548541" SRS="EPSG:4326"/><Title/><Extension><ol:maxExtent xmlns:ol="http://openlayers.org/context" minx="-130.0000000" miny="14.00000000" maxx="-60.00000000" maxy="55.00000000"/></Extension></General><LayerList><Layer queryable="1" hidden="0"><Server service="OGC:WMS" version="1.1.1"><OnlineResource xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://t1.hypercube.telascience.org/cgi-bin/landsat7"/></Server><Name>landsat7</Name><Title>NASA Global Mosaic</Title><FormatList><Format current="1">image/jpeg</Format></FormatList><StyleList><Style current="1"><Name/><Title>Default</Title></Style></StyleList><Extension><ol:maxExtent xmlns:ol="http://openlayers.org/context" minx="-130.0000000" miny="14.00000000" maxx="-60.00000000" maxy="55.00000000"/><ol:numZoomLevels xmlns:ol="http://openlayers.org/context">4</ol:numZoomLevels><ol:units xmlns:ol="http://openlayers.org/context">degrees</ol:units><ol:isBaseLayer xmlns:ol="http://openlayers.org/context">true</ol:isBaseLayer><ol:displayInLayerSwitcher xmlns:ol="http://openlayers.org/context">true</ol:displayInLayerSwitcher><ol:singleTile xmlns:ol="http://openlayers.org/context">false</ol:singleTile><ol:tileSize xmlns:ol="http://openlayers.org/context" width="512" height="1024"/></Extension></Layer><Layer queryable="1" hidden="1"><Server service="OGC:WMS" version="1.1.1"><OnlineResource xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://labs.metacarta.com/wms/vmap0"/></Server><Name>basic</Name><Title>OpenLayers WMS</Title><FormatList><Format current="1">image/jpeg</Format></FormatList><StyleList><Style current="1"><Name/><Title>Default</Title></Style></StyleList><Extension><ol:maxExtent xmlns:ol="http://openlayers.org/context" minx="-130.0000000" miny="14.00000000" maxx="-60.00000000" maxy="55.00000000"/><ol:numZoomLevels xmlns:ol="http://openlayers.org/context">4</ol:numZoomLevels><ol:units xmlns:ol="http://openlayers.org/context">degrees</ol:units><ol:isBaseLayer xmlns:ol="http://openlayers.org/context">true</ol:isBaseLayer><ol:displayInLayerSwitcher xmlns:ol="http://openlayers.org/context">true</ol:displayInLayerSwitcher><ol:singleTile xmlns:ol="http://openlayers.org/context">false</ol:singleTile></Extension></Layer><Layer queryable="1" hidden="0"><Server service="OGC:WMS" version="1.1.1"><OnlineResource xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://lioapp.lrc.gov.on.ca/cubeserv/cubeserv.pl"/></Server><Name>na_road:CCRS</Name><Title>Transportation Network</Title><FormatList><Format current="1">image/png</Format></FormatList><StyleList><Style current="1"><Name/><Title>Default</Title></Style></StyleList><Extension><ol:maxExtent xmlns:ol="http://openlayers.org/context" minx="-166.5320000" miny="4.050460000" maxx="-0.2068180000" maxy="70.28700000"/><ol:transparent xmlns:ol="http://openlayers.org/context">TRUE</ol:transparent><ol:numZoomLevels xmlns:ol="http://openlayers.org/context">4</ol:numZoomLevels><ol:units xmlns:ol="http://openlayers.org/context">degrees</ol:units><ol:isBaseLayer xmlns:ol="http://openlayers.org/context">false</ol:isBaseLayer><ol:opacity xmlns:ol="http://openlayers.org/context">0.6</ol:opacity><ol:displayInLayerSwitcher xmlns:ol="http://openlayers.org/context">false</ol:displayInLayerSwitcher><ol:singleTile xmlns:ol="http://openlayers.org/context">false</ol:singleTile></Extension></Layer><Layer queryable="1" hidden="0"><Server service="OGC:WMS" version="1.1.1"><OnlineResource xlink:type="simple" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://columbo.nrlssc.navy.mil/ogcwms/servlet/WMSServlet/AccuWeather_Maps.wms"/></Server><Name>3:1</Name><Title>Radar 3:1</Title><FormatList><Format current="1">image/png</Format></FormatList><StyleList><Style current="1"><Name/><Title>Default</Title></Style></StyleList><Extension><ol:maxExtent xmlns:ol="http://openlayers.org/context" minx="-131.0294952" miny="14.56289673" maxx="-61.02950287" maxy="54.56289673"/><ol:transparent xmlns:ol="http://openlayers.org/context">TRUE</ol:transparent><ol:numZoomLevels xmlns:ol="http://openlayers.org/context">4</ol:numZoomLevels><ol:units xmlns:ol="http://openlayers.org/context">degrees</ol:units><ol:isBaseLayer xmlns:ol="http://openlayers.org/context">false</ol:isBaseLayer><ol:opacity xmlns:ol="http://openlayers.org/context">0.8</ol:opacity><ol:displayInLayerSwitcher xmlns:ol="http://openlayers.org/context">false</ol:displayInLayerSwitcher><ol:singleTile xmlns:ol="http://openlayers.org/context">true</ol:singleTile></Extension></Layer></LayerList></ViewContext>';
diff --git a/tests/Format/WMC/v1.html b/tests/Format/WMC/v1.html
index 840cfc91bc..e64c30679a 100644
--- a/tests/Format/WMC/v1.html
+++ b/tests/Format/WMC/v1.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_write_wmc_StyleList(t) {
diff --git a/tests/Format/WMC/v1_1_0.html b/tests/Format/WMC/v1_1_0.html
index 0b12eb49a8..815d3bf40e 100644
--- a/tests/Format/WMC/v1_1_0.html
+++ b/tests/Format/WMC/v1_1_0.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
 
     function test_write_wmc_Layer(t) {
diff --git a/tests/Format/WMSCapabilities.html b/tests/Format/WMSCapabilities.html
index 3dbce9d35d..a447bddcd4 100644
--- a/tests/Format/WMSCapabilities.html
+++ b/tests/Format/WMSCapabilities.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_initialize(t) {
diff --git a/tests/Format/WMSCapabilities/v1_1_1.html b/tests/Format/WMSCapabilities/v1_1_1.html
index 0c409275ab..22ee8cb7d6 100644
--- a/tests/Format/WMSCapabilities/v1_1_1.html
+++ b/tests/Format/WMSCapabilities/v1_1_1.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_read(t) {
diff --git a/tests/Format/WMSCapabilities/v1_1_1_WMSC.html b/tests/Format/WMSCapabilities/v1_1_1_WMSC.html
index 845ee67b31..10bcfb1923 100644
--- a/tests/Format/WMSCapabilities/v1_1_1_WMSC.html
+++ b/tests/Format/WMSCapabilities/v1_1_1_WMSC.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_read(t) {
diff --git a/tests/Format/WMSCapabilities/v1_3_0.html b/tests/Format/WMSCapabilities/v1_3_0.html
index 95f6f4b21b..d11faef12b 100644
--- a/tests/Format/WMSCapabilities/v1_3_0.html
+++ b/tests/Format/WMSCapabilities/v1_3_0.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
 
     function test_layers(t) {
diff --git a/tests/Format/WMSDescribeLayer.html b/tests/Format/WMSDescribeLayer.html
index 30ebaffc82..f564da350e 100644
--- a/tests/Format/WMSDescribeLayer.html
+++ b/tests/Format/WMSDescribeLayer.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_read_WMSDescribeLayer(t) {
diff --git a/tests/Format/WMSGetFeatureInfo.html b/tests/Format/WMSGetFeatureInfo.html
index 41a906672e..0445433373 100644
--- a/tests/Format/WMSGetFeatureInfo.html
+++ b/tests/Format/WMSGetFeatureInfo.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_read_FeatureInfoResponse(t) {
diff --git a/tests/Format/WMTSCapabilities.html b/tests/Format/WMTSCapabilities.html
index 7039707308..e7a51a35ee 100644
--- a/tests/Format/WMTSCapabilities.html
+++ b/tests/Format/WMTSCapabilities.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     
     function test_initialize(t) {
diff --git a/tests/Format/WMTSCapabilities/v1_0_0.html b/tests/Format/WMTSCapabilities/v1_0_0.html
index 74925378fa..af01d7c0b4 100644
--- a/tests/Format/WMTSCapabilities/v1_0_0.html
+++ b/tests/Format/WMTSCapabilities/v1_0_0.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
 
         function test_ows(t) {
diff --git a/tests/Format/XML.html b/tests/Format/XML.html
index a85b6fbab7..12f12afc64 100644
--- a/tests/Format/XML.html
+++ b/tests/Format/XML.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     var text =
diff --git a/tests/Geometry.html b/tests/Geometry.html
index c52beffa39..f2d801ddfe 100644
--- a/tests/Geometry.html
+++ b/tests/Geometry.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script src="data/geos_wkt_intersects.js"></script>
   <script type="text/javascript">
     var map; 
diff --git a/tests/Geometry/Collection.html b/tests/Geometry/Collection.html
index 6661677a9e..7c9fd62e05 100644
--- a/tests/Geometry/Collection.html
+++ b/tests/Geometry/Collection.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var coll;
         
diff --git a/tests/Geometry/Curve.html b/tests/Geometry/Curve.html
index 194bf09a49..5afebdf5a0 100644
--- a/tests/Geometry/Curve.html
+++ b/tests/Geometry/Curve.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var curve;
     var components = [new OpenLayers.Geometry.Point(10,10), 
diff --git a/tests/Geometry/LineString.html b/tests/Geometry/LineString.html
index b178620af0..4b2ec0e65f 100644
--- a/tests/Geometry/LineString.html
+++ b/tests/Geometry/LineString.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var line;
     var components = [new OpenLayers.Geometry.Point(10,15), 
diff --git a/tests/Geometry/LinearRing.html b/tests/Geometry/LinearRing.html
index e4d6696581..ea3acca740 100644
--- a/tests/Geometry/LinearRing.html
+++ b/tests/Geometry/LinearRing.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var line;
     var components = [new OpenLayers.Geometry.Point(10,10), 
diff --git a/tests/Geometry/MultiLineString.html b/tests/Geometry/MultiLineString.html
index 0d049de57d..34a6e651be 100644
--- a/tests/Geometry/MultiLineString.html
+++ b/tests/Geometry/MultiLineString.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var line;
         
diff --git a/tests/Geometry/MultiPoint.html b/tests/Geometry/MultiPoint.html
index 1fa0696429..47ce430bda 100644
--- a/tests/Geometry/MultiPoint.html
+++ b/tests/Geometry/MultiPoint.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var point = new OpenLayers.Geometry.Point(10, 15);
      
diff --git a/tests/Geometry/MultiPolygon.html b/tests/Geometry/MultiPolygon.html
index 6b6e35576f..f44de93f20 100644
--- a/tests/Geometry/MultiPolygon.html
+++ b/tests/Geometry/MultiPolygon.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var polygon;
     var components = [new OpenLayers.Geometry.Point(10,10), new OpenLayers.Geometry.Point(0,0)];
diff --git a/tests/Geometry/Point.html b/tests/Geometry/Point.html
index 8932ee2901..9baaf5c72b 100644
--- a/tests/Geometry/Point.html
+++ b/tests/Geometry/Point.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var point; 
         
diff --git a/tests/Geometry/Polygon.html b/tests/Geometry/Polygon.html
index 2a5fb361b0..598b68800e 100644
--- a/tests/Geometry/Polygon.html
+++ b/tests/Geometry/Polygon.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var polygon;
     var components = [new OpenLayers.Geometry.Point(10,14), new OpenLayers.Geometry.Point(5,3)];
diff --git a/tests/Geometry/Rectangle.html b/tests/Geometry/Rectangle.html
index 87e04d77cd..41dc95a010 100644
--- a/tests/Geometry/Rectangle.html
+++ b/tests/Geometry/Rectangle.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_Rectangle_constructor (t) {
diff --git a/tests/Geometry/Surface.html b/tests/Geometry/Surface.html
index 25e1705305..5efc5c238e 100644
--- a/tests/Geometry/Surface.html
+++ b/tests/Geometry/Surface.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_Surface_constructor (t) {
diff --git a/tests/Handler.html b/tests/Handler.html
index 16500652ea..a20ffbb657 100644
--- a/tests/Handler.html
+++ b/tests/Handler.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_constructor(t) {
         t.plan(4);
diff --git a/tests/Handler/Box.html b/tests/Handler/Box.html
index 93c89e291f..b517dd9bb2 100644
--- a/tests/Handler/Box.html
+++ b/tests/Handler/Box.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_Box_destroy(t) {
         t.plan(1);
diff --git a/tests/Handler/Click.html b/tests/Handler/Click.html
index 0ffa6ff992..8156c99ede 100644
--- a/tests/Handler/Click.html
+++ b/tests/Handler/Click.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_Click_constructor(t) {
         t.plan(3);
diff --git a/tests/Handler/Drag.html b/tests/Handler/Drag.html
index 09e5d42a35..d9344a9beb 100644
--- a/tests/Handler/Drag.html
+++ b/tests/Handler/Drag.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_Drag_constructor(t) {
         t.plan(3);
diff --git a/tests/Handler/Feature.html b/tests/Handler/Feature.html
index 2f1e6de901..db258db433 100644
--- a/tests/Handler/Feature.html
+++ b/tests/Handler/Feature.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_initialize(t) {
         t.plan(4);
diff --git a/tests/Handler/Hover.html b/tests/Handler/Hover.html
index 075aa14f71..150218a2c3 100644
--- a/tests/Handler/Hover.html
+++ b/tests/Handler/Hover.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_Hover_events(t) {
         t.plan(10);
diff --git a/tests/Handler/Keyboard.html b/tests/Handler/Keyboard.html
index 0ea739ce31..947cd99b09 100644
--- a/tests/Handler/Keyboard.html
+++ b/tests/Handler/Keyboard.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_Keyboard_initialize(t) {
         t.plan(3);
diff --git a/tests/Handler/MouseWheel.html b/tests/Handler/MouseWheel.html
index d5e340bef7..d41c2cd18c 100644
--- a/tests/Handler/MouseWheel.html
+++ b/tests/Handler/MouseWheel.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_MouseWheel_constructor(t) {
         t.plan(3);
diff --git a/tests/Handler/Path.html b/tests/Handler/Path.html
index a46a055633..7850938964 100644
--- a/tests/Handler/Path.html
+++ b/tests/Handler/Path.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_Path_constructor(t) {
         t.plan(3);
diff --git a/tests/Handler/Point.html b/tests/Handler/Point.html
index fb10edf8aa..5e2cc7a3e9 100644
--- a/tests/Handler/Point.html
+++ b/tests/Handler/Point.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_Point_constructor(t) {
         t.plan(3);
diff --git a/tests/Handler/Polygon.html b/tests/Handler/Polygon.html
index f9a40ad403..d53afaf76c 100644
--- a/tests/Handler/Polygon.html
+++ b/tests/Handler/Polygon.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_Polygon_constructor(t) {
         t.plan(3);
diff --git a/tests/Handler/RegularPolygon.html b/tests/Handler/RegularPolygon.html
index 21e6c3684c..3ce9e78089 100644
--- a/tests/Handler/RegularPolygon.html
+++ b/tests/Handler/RegularPolygon.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     function test_Handler_RegularPolygon_constructor(t) {
         t.plan(3);
diff --git a/tests/Icon.html b/tests/Icon.html
index 09f09b8117..ac542d24d5 100644
--- a/tests/Icon.html
+++ b/tests/Icon.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
     var icon; 
     
diff --git a/tests/Lang.html b/tests/Lang.html
index 3251e34919..eb50f2e85c 100644
--- a/tests/Lang.html
+++ b/tests/Lang.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../lib/OpenLayers.js"></script>
+    <script src="OLLoader.js"></script>
     <script src="../lib/OpenLayers/Lang/en-CA.js" type="text/javascript"></script>
     <script src="../lib/OpenLayers/Lang/fr.js" type="text/javascript"></script>
     <script type="text/javascript">
diff --git a/tests/Layer.html b/tests/Layer.html
index 22b781a6fe..102c92139d 100644
--- a/tests/Layer.html
+++ b/tests/Layer.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
     var layer; 
 
diff --git a/tests/Layer/ArcGIS93Rest.html b/tests/Layer/ArcGIS93Rest.html
index de37de444f..1b2693bd54 100644
--- a/tests/Layer/ArcGIS93Rest.html
+++ b/tests/Layer/ArcGIS93Rest.html
@@ -2,7 +2,7 @@
 <head>
     <script type="text/javascript">var oldAlert = window.alert, gMess; window.alert = function(message) {gMess = message; return true;};</script>
     <script type="text/javascript">window.alert = oldAlert;</script>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var layer; 
diff --git a/tests/Layer/ArcIMS.html b/tests/Layer/ArcIMS.html
index 48cf30909b..4f86227be2 100644
--- a/tests/Layer/ArcIMS.html
+++ b/tests/Layer/ArcIMS.html
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <script type="text/javascript" src="../../lib/OpenLayers.js"></script>
+    <script type="text/javascript" src="../OLLoader.js"></script>
     <script type="text/javascript">
     
       // use an arcims map service against Avencia Inc.'s global sample map services
diff --git a/tests/Layer/Bing.html b/tests/Layer/Bing.html
index 9c35abe784..4d6a61040e 100644
--- a/tests/Layer/Bing.html
+++ b/tests/Layer/Bing.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var map, layer; 
 
diff --git a/tests/Layer/EventPane.html b/tests/Layer/EventPane.html
index bed623e055..ead8a96e50 100644
--- a/tests/Layer/EventPane.html
+++ b/tests/Layer/EventPane.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var isOpera = (navigator.userAgent.indexOf("Opera") != -1);
diff --git a/tests/Layer/FixedZoomLevels.html b/tests/Layer/FixedZoomLevels.html
index 9e00cb6716..581b445da3 100644
--- a/tests/Layer/FixedZoomLevels.html
+++ b/tests/Layer/FixedZoomLevels.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var layer; 
 
diff --git a/tests/Layer/GML.html b/tests/Layer/GML.html
index 8e01e9475f..83ad4dbf0e 100644
--- a/tests/Layer/GML.html
+++ b/tests/Layer/GML.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     var name = "GML Layer";
diff --git a/tests/Layer/GeoRSS.html b/tests/Layer/GeoRSS.html
index bb589036eb..a942e83fe0 100644
--- a/tests/Layer/GeoRSS.html
+++ b/tests/Layer/GeoRSS.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var isMSIE    = (navigator.userAgent.indexOf("MSIE") > -1);
diff --git a/tests/Layer/Google.html b/tests/Layer/Google.html
index 2f205260c3..c826ef481f 100644
--- a/tests/Layer/Google.html
+++ b/tests/Layer/Google.html
@@ -4,7 +4,7 @@
     <!-- this gmaps key generated for http://openlayers.org/dev/ -->
     <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAA9XNhd8q0UdwNC7YSO4YZghSPUCi5aRYVveCcVYxzezM4iaj_gxQ9t-UajFL70jfcpquH5l1IJ-Zyyw'></script>
     <script type="text/javascript">window.alert = oldAlert;</script>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     var layer; 
     var validkey = (window.location.protocol == "file:") ||
diff --git a/tests/Layer/Google/v3.html b/tests/Layer/Google/v3.html
index 477a6546f9..f2dcbe352a 100644
--- a/tests/Layer/Google/v3.html
+++ b/tests/Layer/Google/v3.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
 
     var layer; 
diff --git a/tests/Layer/Grid.html b/tests/Layer/Grid.html
index 1ce7a636c2..98c86eea6c 100644
--- a/tests/Layer/Grid.html
+++ b/tests/Layer/Grid.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var layer; 
diff --git a/tests/Layer/HTTPRequest.html b/tests/Layer/HTTPRequest.html
index 5c82f452c0..02311564f1 100644
--- a/tests/Layer/HTTPRequest.html
+++ b/tests/Layer/HTTPRequest.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var layer; 
 
diff --git a/tests/Layer/Image.html b/tests/Layer/Image.html
index a519859039..fccc51d409 100644
--- a/tests/Layer/Image.html
+++ b/tests/Layer/Image.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var layer; 
 
diff --git a/tests/Layer/KaMap.html b/tests/Layer/KaMap.html
index 11573b6082..013d36dd11 100644
--- a/tests/Layer/KaMap.html
+++ b/tests/Layer/KaMap.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var layer; 
diff --git a/tests/Layer/MapGuide.html b/tests/Layer/MapGuide.html
index 43ebaa2113..d0ffd16dbf 100644
--- a/tests/Layer/MapGuide.html
+++ b/tests/Layer/MapGuide.html
@@ -3,7 +3,7 @@
     <script type="text/javascript">var oldAlert = window.alert, gMess; window.alert = function(message) {gMess = message; return true;};</script>
     <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script>
     <script type="text/javascript">window.alert = oldAlert;</script>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var layer; 
diff --git a/tests/Layer/MapServer.html b/tests/Layer/MapServer.html
index b458a9080a..8c4314ddf1 100644
--- a/tests/Layer/MapServer.html
+++ b/tests/Layer/MapServer.html
@@ -5,7 +5,7 @@
     <script type="text/javascript">window.alert = oldAlert;</script>
     
 
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var layer; 
diff --git a/tests/Layer/Markers.html b/tests/Layer/Markers.html
index 6e994f5752..2db3052e60 100644
--- a/tests/Layer/Markers.html
+++ b/tests/Layer/Markers.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var layer; 
 
diff --git a/tests/Layer/MultiMap.html b/tests/Layer/MultiMap.html
index ad2210128d..8ae07d2adc 100644
--- a/tests/Layer/MultiMap.html
+++ b/tests/Layer/MultiMap.html
@@ -2,7 +2,7 @@
 <head>
   <!-- multimap api key for http://(www.)openlayers.org -->
   <script type="text/javascript" src="http://developer.multimap.com/API/maps/1.2/OA10072915821139765"></script>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var doTest = true;
     function test_Layer_MultiMap_constructor (t) {
diff --git a/tests/Layer/PointTrack.html b/tests/Layer/PointTrack.html
index b8b70b8154..d889db27f3 100644
--- a/tests/Layer/PointTrack.html
+++ b/tests/Layer/PointTrack.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
   
     var name = "PointTrack Layer";
diff --git a/tests/Layer/SphericalMercator.html b/tests/Layer/SphericalMercator.html
index e7202171f1..c2bbdfc632 100644
--- a/tests/Layer/SphericalMercator.html
+++ b/tests/Layer/SphericalMercator.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
     function test_SphericalMercator_forwardMercator(t) {
         t.plan(12);
diff --git a/tests/Layer/TMS.html b/tests/Layer/TMS.html
index e8205da8f3..3bfc3cb856 100644
--- a/tests/Layer/TMS.html
+++ b/tests/Layer/TMS.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var layer; 
diff --git a/tests/Layer/Text.html b/tests/Layer/Text.html
index 6803aa4b9b..0cf6dcf580 100644
--- a/tests/Layer/Text.html
+++ b/tests/Layer/Text.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var isMSIE = (navigator.userAgent.indexOf("MSIE") > -1);
diff --git a/tests/Layer/TileCache.html b/tests/Layer/TileCache.html
index d24a44acc9..6ae2bc1c86 100644
--- a/tests/Layer/TileCache.html
+++ b/tests/Layer/TileCache.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
 
diff --git a/tests/Layer/Vector.html b/tests/Layer/Vector.html
index 837ab73261..1a47aaf4c3 100644
--- a/tests/Layer/Vector.html
+++ b/tests/Layer/Vector.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     var name = "Vector Layer";
diff --git a/tests/Layer/Vector/RootContainer.html b/tests/Layer/Vector/RootContainer.html
index 982e492f6a..aa92923412 100644
--- a/tests/Layer/Vector/RootContainer.html
+++ b/tests/Layer/Vector/RootContainer.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../../lib/OpenLayers.js"></script>
+  <script src="../../OLLoader.js"></script>
   <script type="text/javascript">
     var layer, map; 
 
diff --git a/tests/Layer/WFS.html b/tests/Layer/WFS.html
index a74b782652..42b566acfe 100644
--- a/tests/Layer/WFS.html
+++ b/tests/Layer/WFS.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     var name = "Vector Layer";
diff --git a/tests/Layer/WMS.html b/tests/Layer/WMS.html
index f17b56a354..839c77c348 100644
--- a/tests/Layer/WMS.html
+++ b/tests/Layer/WMS.html
@@ -3,7 +3,7 @@
     <script type="text/javascript">var oldAlert = window.alert, gMess; window.alert = function(message) {gMess = message; return true;};</script>
     <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script>
     <script type="text/javascript">window.alert = oldAlert;</script>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var layer;
diff --git a/tests/Layer/WMS/Post.html b/tests/Layer/WMS/Post.html
index 80a2539973..90ff0b89df 100644
--- a/tests/Layer/WMS/Post.html
+++ b/tests/Layer/WMS/Post.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var isOpera   = (navigator.userAgent.indexOf("Opera") != -1);
diff --git a/tests/Layer/WMTS.html b/tests/Layer/WMTS.html
index b733bac2b7..aa1bed4033 100644
--- a/tests/Layer/WMTS.html
+++ b/tests/Layer/WMTS.html
@@ -1,6 +1,6 @@
 <html>
     <head>
-        <script src="../../lib/OpenLayers.js"></script>
+        <script src="../OLLoader.js"></script>
         <script type="text/javascript">    
 
             function test_constructor(t) {
diff --git a/tests/Layer/WrapDateLine.html b/tests/Layer/WrapDateLine.html
index 01ed22f097..deeb874778 100644
--- a/tests/Layer/WrapDateLine.html
+++ b/tests/Layer/WrapDateLine.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var layer; 
diff --git a/tests/Layer/XYZ.html b/tests/Layer/XYZ.html
index b37b8e9477..c59cb76b6c 100644
--- a/tests/Layer/XYZ.html
+++ b/tests/Layer/XYZ.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var layer; 
 
diff --git a/tests/Layer/Yahoo.html b/tests/Layer/Yahoo.html
index 9059f02439..b3b8372f9c 100755
--- a/tests/Layer/Yahoo.html
+++ b/tests/Layer/Yahoo.html
@@ -1,7 +1,7 @@
 <html>
 <head>
   <script src="http://api.maps.yahoo.com/ajaxymap?v=3.0&appid=euzuro-openlayers"></script>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var layer; 
 
diff --git a/tests/Map.html b/tests/Map.html
index 43a83462bc..13712f81af 100644
--- a/tests/Map.html
+++ b/tests/Map.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
 
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
diff --git a/tests/Marker.html b/tests/Marker.html
index 69b9a81935..77abc31285 100644
--- a/tests/Marker.html
+++ b/tests/Marker.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
 
     var marker;
diff --git a/tests/Marker/Box.html b/tests/Marker/Box.html
index 92a31f6399..806336e7f6 100644
--- a/tests/Marker/Box.html
+++ b/tests/Marker/Box.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var box; 
     
diff --git a/tests/OLLoader.js b/tests/OLLoader.js
new file mode 100644
index 0000000000..7e791c96dc
--- /dev/null
+++ b/tests/OLLoader.js
@@ -0,0 +1,11 @@
+// Adding a mode parameter with "build" as value in the run-tests.html will 
+// make usage of the build version of the library.
+var regexS = "[\\?&]mode=([^&#]*)";
+var regex = new RegExp( regexS );
+var href = window.parent.location.href;
+var url = href.substring(0, href.lastIndexOf('/') + 1);
+var results = regex.exec( href );
+url += (results && results[1] == 'build') ? 
+    "../build/OpenLayers.js" : "../lib/OpenLayers.js"; 
+scriptTag = "<script src='" + url + "'></script>"; 
+document.write(scriptTag);
diff --git a/tests/OpenLayers1.html b/tests/OpenLayers1.html
index ea574efa61..4e7bd1554f 100644
--- a/tests/OpenLayers1.html
+++ b/tests/OpenLayers1.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../lib/OpenLayers.js"></script>
+    <script src="OLLoader.js"></script>
     <script type="text/javascript">
         function test_OpenLayers(t) {
             t.plan(1);
diff --git a/tests/OpenLayers2.html b/tests/OpenLayers2.html
index fbdb043ffd..f03180e1b1 100644
--- a/tests/OpenLayers2.html
+++ b/tests/OpenLayers2.html
@@ -2,7 +2,7 @@
 <head>
     <script src="bogus/1/OpenLayers.js-foo"></script>
     <script src="bogus/2/foo-OpenLayers.js"></script>
-    <script src="../lib/OpenLayers.js?foo"></script>
+    <script src="OLLoader.js?foo"></script>
     <script src="bogus/3/after-OpenLayers.js"></script>
     <script type="text/javascript">
         function test_OpenLayers(t) {
diff --git a/tests/OpenLayers3.html b/tests/OpenLayers3.html
index c4cbb804c1..4c03ac151b 100644
--- a/tests/OpenLayers3.html
+++ b/tests/OpenLayers3.html
@@ -3,7 +3,7 @@
     <script>
     var OpenLayers = {singleFile: true};
     </script>
-    <script src="../lib/OpenLayers.js"></script>
+    <script src="OLLoader.js"></script>
     <script type="text/javascript">
         function test_OpenLayers(t) {
             t.plan(1);
diff --git a/tests/OpenLayers4.html b/tests/OpenLayers4.html
index 415c0607c3..b9b724af4f 100644
--- a/tests/OpenLayers4.html
+++ b/tests/OpenLayers4.html
@@ -2,7 +2,7 @@
 <head>
     <script type="text/javascript">
 	OpenLayers = {singleFile: true}; // just to make the test run faster
-        document.write('<scr'+'ipt src="../lib/OpenLayers.js"></scr'+'ipt>');
+        document.write('<scr'+'ipt src="OLLoader.js"></scr'+'ipt>');
         document.write('<scr'+'ipt src="bogus/foo-/OpenLayers.js"></scr'+'ipt>');
     </script>
     <script type="text/javascript">
diff --git a/tests/OpenLayersJsFiles.html b/tests/OpenLayersJsFiles.html
index 8dff0ec592..cffc180268 100644
--- a/tests/OpenLayersJsFiles.html
+++ b/tests/OpenLayersJsFiles.html
@@ -6,7 +6,7 @@
             "OpenLayers/BaseTypes.js"
         );
     </script>
-    <script src="../lib/OpenLayers.js"></script>
+    <script src="OLLoader.js"></script>
     <script type="text/javascript">
         function test_OpenLayers(t) {
             t.plan(1);
diff --git a/tests/Popup.html b/tests/Popup.html
index 920a763506..9d22f6a147 100644
--- a/tests/Popup.html
+++ b/tests/Popup.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
 
     var popup;
diff --git a/tests/Popup/Anchored.html b/tests/Popup/Anchored.html
index 80db4d2861..f53546b0c0 100644
--- a/tests/Popup/Anchored.html
+++ b/tests/Popup/Anchored.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     var popup;
diff --git a/tests/Popup/AnchoredBubble.html b/tests/Popup/AnchoredBubble.html
index a3ba5993a1..bd2d8123b2 100644
--- a/tests/Popup/AnchoredBubble.html
+++ b/tests/Popup/AnchoredBubble.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
    function test_Popup_Anchored_setOpacity(t) { 
diff --git a/tests/Popup/FramedCloud.html b/tests/Popup/FramedCloud.html
index b7f33257a5..7da86e36ea 100644
--- a/tests/Popup/FramedCloud.html
+++ b/tests/Popup/FramedCloud.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
    function test_Popup_FramedCloud_setHTML(t) { 
diff --git a/tests/Projection.html b/tests/Projection.html
index 2f7133895c..d8d0a3bf9f 100644
--- a/tests/Projection.html
+++ b/tests/Projection.html
@@ -1,6 +1,6 @@
 <html> 
   <head> 
-    <script src="../lib/OpenLayers.js"></script> 
+    <script src="OLLoader.js"></script> 
     <script type="text/javascript"> 
      function test_Projection_constructor(t) { 
          t.plan(9); 
diff --git a/tests/Protocol.html b/tests/Protocol.html
index 2cca7606f8..7432b86ea6 100644
--- a/tests/Protocol.html
+++ b/tests/Protocol.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Protocol/HTTP.html b/tests/Protocol/HTTP.html
index 9716a9b7b3..5820b97ab6 100644
--- a/tests/Protocol/HTTP.html
+++ b/tests/Protocol/HTTP.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_constructor(t) {
diff --git a/tests/Protocol/SOS.html b/tests/Protocol/SOS.html
index 4e4277b889..58e66070db 100644
--- a/tests/Protocol/SOS.html
+++ b/tests/Protocol/SOS.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_constructor(t) {
diff --git a/tests/Protocol/SQL.html b/tests/Protocol/SQL.html
index 01377e0dd3..f02a5e855d 100644
--- a/tests/Protocol/SQL.html
+++ b/tests/Protocol/SQL.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Protocol/SQL/Gears.html b/tests/Protocol/SQL/Gears.html
index 6f97f1a0b1..c206e5aa84 100644
--- a/tests/Protocol/SQL/Gears.html
+++ b/tests/Protocol/SQL/Gears.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../../lib/OpenLayers.js"></script>
+  <script src="../../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Protocol/WFS.html b/tests/Protocol/WFS.html
index f2e950a96a..5aa3cbca04 100644
--- a/tests/Protocol/WFS.html
+++ b/tests/Protocol/WFS.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Renderer.html b/tests/Renderer.html
index c3d0092ab4..a149d63746 100644
--- a/tests/Renderer.html
+++ b/tests/Renderer.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../lib/OpenLayers.js"></script>
+<script src="OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_Renderer_constructor(t) {
diff --git a/tests/Renderer/Canvas.html b/tests/Renderer/Canvas.html
index 32be280476..d46d6dfb02 100644
--- a/tests/Renderer/Canvas.html
+++ b/tests/Renderer/Canvas.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var supported = OpenLayers.Renderer.Canvas.prototype.supported();
     function test_Renderer_Canvas_constructor(t) {
diff --git a/tests/Renderer/Elements.html b/tests/Renderer/Elements.html
index a5c5c2c014..48db70adf0 100644
--- a/tests/Renderer/Elements.html
+++ b/tests/Renderer/Elements.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function setUp() {
diff --git a/tests/Renderer/SVG.html b/tests/Renderer/SVG.html
index 5faeda49bf..fd82093d5e 100644
--- a/tests/Renderer/SVG.html
+++ b/tests/Renderer/SVG.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     var geometry = null, node = null;
diff --git a/tests/Renderer/VML.html b/tests/Renderer/VML.html
index d4906e2009..f383848cf4 100644
--- a/tests/Renderer/VML.html
+++ b/tests/Renderer/VML.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     var geometry = null, node = null;
diff --git a/tests/Request.html b/tests/Request.html
index f4db5fdcfe..52643e450d 100644
--- a/tests/Request.html
+++ b/tests/Request.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../lib/OpenLayers.js"></script>
+    <script src="OLLoader.js"></script>
     <script type="text/javascript">
     function setup() {
         window._xhr = OpenLayers.Request.XMLHttpRequest;
diff --git a/tests/Request/XMLHttpRequest.html b/tests/Request/XMLHttpRequest.html
index 237ad48d2b..fa628077cb 100644
--- a/tests/Request/XMLHttpRequest.html
+++ b/tests/Request/XMLHttpRequest.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../lib/OpenLayers.js"></script>
+    <script src="../OLLoader.js"></script>
     <script type="text/javascript">
         function test_constructor(t) {
             t.plan(1);
diff --git a/tests/Rule.html b/tests/Rule.html
index 00ef26b61c..56e3483eed 100644
--- a/tests/Rule.html
+++ b/tests/Rule.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../lib/OpenLayers.js"></script> 
+    <script src="OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_Rule_constructor(t) { 
diff --git a/tests/Strategy.html b/tests/Strategy.html
index 99521f6065..5ecdef67fc 100644
--- a/tests/Strategy.html
+++ b/tests/Strategy.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Strategy/BBOX.html b/tests/Strategy/BBOX.html
index f03dd6523f..12543c627d 100644
--- a/tests/Strategy/BBOX.html
+++ b/tests/Strategy/BBOX.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_initialize(t) {
diff --git a/tests/Strategy/Cluster.html b/tests/Strategy/Cluster.html
index 18e5a6fe55..38cc116ba7 100644
--- a/tests/Strategy/Cluster.html
+++ b/tests/Strategy/Cluster.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_activate(t) {
diff --git a/tests/Strategy/Filter.html b/tests/Strategy/Filter.html
index b88532af73..798ecb1e5e 100644
--- a/tests/Strategy/Filter.html
+++ b/tests/Strategy/Filter.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script src="../../lib/OpenLayers.js"></script>
+<script src="../OLLoader.js"></script>
 <script>
 
 var features = [];
diff --git a/tests/Strategy/Fixed.html b/tests/Strategy/Fixed.html
index 9c81e38c57..209d8daab6 100644
--- a/tests/Strategy/Fixed.html
+++ b/tests/Strategy/Fixed.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_activate(t) {
diff --git a/tests/Strategy/Paging.html b/tests/Strategy/Paging.html
index 221cd5c86a..a85167eaa6 100644
--- a/tests/Strategy/Paging.html
+++ b/tests/Strategy/Paging.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     function test_activate(t) {
diff --git a/tests/Strategy/Refresh.html b/tests/Strategy/Refresh.html
index d04b55a797..f8fb451c76 100644
--- a/tests/Strategy/Refresh.html
+++ b/tests/Strategy/Refresh.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
 
     var interval = 5000;
diff --git a/tests/Strategy/Save.html b/tests/Strategy/Save.html
index bbab07f59e..12904854b7 100644
--- a/tests/Strategy/Save.html
+++ b/tests/Strategy/Save.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
   
     function test_initialize(t) {
diff --git a/tests/Style.html b/tests/Style.html
index 392c2f0882..2165134018 100644
--- a/tests/Style.html
+++ b/tests/Style.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../lib/OpenLayers.js"></script> 
+    <script src="OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_Style_constructor(t) { 
diff --git a/tests/Style2.html b/tests/Style2.html
index 9127f3364b..87ab584480 100644
--- a/tests/Style2.html
+++ b/tests/Style2.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../lib/OpenLayers.js"></script> 
+    <script src="OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_constructor(t) { 
diff --git a/tests/StyleMap.html b/tests/StyleMap.html
index 221335221a..6c633c3d8d 100644
--- a/tests/StyleMap.html
+++ b/tests/StyleMap.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../lib/OpenLayers.js"></script> 
+    <script src="OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_StyleMap_constructor(t) { 
diff --git a/tests/Symbolizer.html b/tests/Symbolizer.html
index 5f51e91c8b..be24e9c7b8 100644
--- a/tests/Symbolizer.html
+++ b/tests/Symbolizer.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../lib/OpenLayers.js"></script> 
+    <script src="OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_constructor(t) { 
diff --git a/tests/Symbolizer/Line.html b/tests/Symbolizer/Line.html
index 7f57e2a92e..5396f3bdf1 100644
--- a/tests/Symbolizer/Line.html
+++ b/tests/Symbolizer/Line.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_constructor(t) { 
diff --git a/tests/Symbolizer/Point.html b/tests/Symbolizer/Point.html
index d4715adae1..b1311c07f9 100644
--- a/tests/Symbolizer/Point.html
+++ b/tests/Symbolizer/Point.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_constructor(t) { 
diff --git a/tests/Symbolizer/Polygon.html b/tests/Symbolizer/Polygon.html
index 4f64599f1a..ebea5eaff3 100644
--- a/tests/Symbolizer/Polygon.html
+++ b/tests/Symbolizer/Polygon.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_constructor(t) { 
diff --git a/tests/Symbolizer/Raster.html b/tests/Symbolizer/Raster.html
index ff4bb045cc..8dd9cb9a59 100644
--- a/tests/Symbolizer/Raster.html
+++ b/tests/Symbolizer/Raster.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_constructor(t) { 
diff --git a/tests/Symbolizer/Text.html b/tests/Symbolizer/Text.html
index 51c0d461c5..a849f20c1b 100644
--- a/tests/Symbolizer/Text.html
+++ b/tests/Symbolizer/Text.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../../lib/OpenLayers.js"></script> 
+    <script src="../OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_constructor(t) { 
diff --git a/tests/Tile.html b/tests/Tile.html
index 930f2e6c5b..b199f03f3d 100644
--- a/tests/Tile.html
+++ b/tests/Tile.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
     var tile; 
     
diff --git a/tests/Tile/Image.html b/tests/Tile/Image.html
index c7455cfab2..6b8452695e 100644
--- a/tests/Tile/Image.html
+++ b/tests/Tile/Image.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var tile; 
diff --git a/tests/Tile/Image/IFrame.html b/tests/Tile/Image/IFrame.html
index 9650b01f54..c5f3218424 100644
--- a/tests/Tile/Image/IFrame.html
+++ b/tests/Tile/Image/IFrame.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <script src="../../../lib/OpenLayers.js"></script>
+    <script src="../../OLLoader.js"></script>
     <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var isOpera   = (navigator.userAgent.indexOf("Opera") != -1);
diff --git a/tests/Tile/WFS.html b/tests/Tile/WFS.html
index c0b57c9fae..ae996ceb5c 100644
--- a/tests/Tile/WFS.html
+++ b/tests/Tile/WFS.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <script src="../../lib/OpenLayers.js"></script>
+  <script src="../OLLoader.js"></script>
   <script type="text/javascript">
     var tile; 
     
diff --git a/tests/Tween.html b/tests/Tween.html
index be159a7048..f185bee97f 100644
--- a/tests/Tween.html
+++ b/tests/Tween.html
@@ -1,6 +1,6 @@
 <html> 
 <head> 
-    <script src="../lib/OpenLayers.js"></script> 
+    <script src="OLLoader.js"></script> 
     <script type="text/javascript">
 
     function test_Tween_constructor(t) { 
diff --git a/tests/Util.html b/tests/Util.html
index 87b9508f1e..c921df9bfe 100644
--- a/tests/Util.html
+++ b/tests/Util.html
@@ -18,7 +18,7 @@
         "OpenLayers/Console.js"
     ];
   </script>
-  <script src="../lib/OpenLayers.js"></script>
+  <script src="OLLoader.js"></script>
   <script type="text/javascript">
     var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
     var map;