diff --git a/archiva-webapp-test/src/appserver-base/conf/archiva.xml b/archiva-webapp-test/src/appserver-base/conf/archiva.xml
new file mode 100644
index 000000000..9afb83352
--- /dev/null
+++ b/archiva-webapp-test/src/appserver-base/conf/archiva.xml
@@ -0,0 +1 @@
+<configuration />
diff --git a/archiva-webapp-test/src/appserver-base/conf/shared.xml b/archiva-webapp-test/src/appserver-base/conf/shared.xml
new file mode 100644
index 000000000..9afb83352
--- /dev/null
+++ b/archiva-webapp-test/src/appserver-base/conf/shared.xml
@@ -0,0 +1 @@
+<configuration />
diff --git a/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/SettingsTest.java b/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/SettingsTest.java
index ba17ee798..450df31b5 100644
--- a/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/SettingsTest.java
+++ b/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/SettingsTest.java
@@ -45,11 +45,11 @@ public class SettingsTest
     {
         clickEditConfiguration();
 
-        setFieldValue( "indexPath", getBasedir() + "target/index" );
+        setFieldValue( "indexPath", getBasedir() + "/target/web-ui-index" );
         clickButtonWithValue( "Save Configuration" );
         waitPage();
         assertPage( "Administration" );
-        assertTextPresent( getBasedir() + "target/index" );
+        assertTextPresent( getBasedir() + "/target/web-ui-index" );
 
         logout();
     }
@@ -156,4 +156,29 @@ public class SettingsTest
         assertPage( "Administration" );
     }
 
+    public void tearDown()
+        throws Exception
+    {
+        clickEditConfiguration();
+        setFieldValue( "indexPath", getBasedir() + "/target/web-ui-index" );
+        setFieldValue( "second", "0" );
+        setFieldValue( "minute", "0,30" );
+        setFieldValue( "hour", "*" );
+        setFieldValue( "dayOfMonth", "*" );
+        setFieldValue( "month", "*" );
+        setFieldValue( "dayOfWeek", "?" );
+        setFieldValue( "year", "" );
+        setFieldValue( "proxy.port", "8080" );
+        setFieldValue( "proxy.host", "" );
+        setFieldValue( "proxy.username", "" );
+        setFieldValue( "proxy.password", "" );
+        clickButtonWithValue( "Save Configuration" );
+        waitPage();
+        assertPage( "Administration" );
+
+        logout();
+
+        super.tearDown();
+    }
+
 }