diff --git a/library/server/ewsgi/ewsgi-full-safe.ecf b/library/server/ewsgi/tests/ewsgi-full-safe.ecf
similarity index 64%
rename from library/server/ewsgi/ewsgi-full-safe.ecf
rename to library/server/ewsgi/tests/ewsgi-full-safe.ecf
index 8e81a9df..9acab6e2 100644
--- a/library/server/ewsgi/ewsgi-full-safe.ecf
+++ b/library/server/ewsgi/tests/ewsgi-full-safe.ecf
@@ -10,15 +10,15 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
-		<library name="error" location="..\..\error\error-safe.ecf"/>
-		<library name="http" location="..\..\protocol\http\http-safe.ecf"/>
-		<library name="libfcgi" location="..\libfcgi\libfcgi-safe.ecf"/>
-		<library name="nino" location="..\..\..\ext\server\nino\nino-safe.ecf" readonly="false">
+		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
+		<library name="error" location="..\..\..\error\error-safe.ecf"/>
+		<library name="http" location="..\..\..\protocol\http\http-safe.ecf"/>
+		<library name="libfcgi" location="..\..\libfcgi\libfcgi-safe.ecf"/>
+		<library name="nino" location="..\..\..\..\ext\server\nino\nino-safe.ecf" readonly="false">
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<cluster name="connectors" location="connectors\" recursive="true"/>
-		<cluster name="interface" location="src\" recursive="true"/>
+		<cluster name="connectors" location="..\connectors\" recursive="true"/>
+		<cluster name="interface" location="..\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/ewsgi/ewsgi-full.ecf b/library/server/ewsgi/tests/ewsgi-full.ecf
similarity index 62%
rename from library/server/ewsgi/ewsgi-full.ecf
rename to library/server/ewsgi/tests/ewsgi-full.ecf
index c40b7779..0d27bb90 100644
--- a/library/server/ewsgi/ewsgi-full.ecf
+++ b/library/server/ewsgi/tests/ewsgi-full.ecf
@@ -10,16 +10,15 @@
 		<option warning="true" full_class_checking="true" syntax="provisional">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<library name="ewsgi" location="ewsgi.ecf"/>
-		<library name="error" location="..\..\error\error.ecf"/>
-		<library name="http" location="..\..\protocol\http\http.ecf"/>
-		<library name="encoder" location="..\..\text\encoder\encoder.ecf" readonly="false"/>
-		<library name="libfcgi" location="..\libfcgi\libfcgi.ecf"/>
-		<library name="nino" location="..\..\..\ext\server\nino\nino.ecf" readonly="false">
+		<library name="error" location="..\..\..\error\error.ecf"/>
+		<library name="http" location="..\..\..\protocol\http\http.ecf"/>
+		<library name="encoder" location="..\..\..\text\encoder\encoder.ecf" readonly="false"/>
+		<library name="libfcgi" location="..\..\libfcgi\libfcgi.ecf"/>
+		<library name="nino" location="..\..\..\..\ext\server\nino\nino.ecf" readonly="false">
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<cluster name="connectors" location="connectors\" recursive="true"/>
-		<cluster name="interface" location="src\" recursive="true"/>
+		<cluster name="connectors" location="..\connectors\" recursive="true"/>
+		<cluster name="interface" location="..\src\" recursive="true"/>
 	</target>
 </system>