diff --git a/test-integration/.gitignore b/test-integration/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..4387352cdb066188c2736543e3319d0b5219dbe1
--- /dev/null
+++ b/test-integration/.gitignore
@@ -0,0 +1,9 @@
+.gradle/
+.idea/
+build/
+targets/
+etc/full-text-search-document-version
+*.iml
+*.eml
+.shredder
+.dynamic_property_evaluator_queue
diff --git a/test-integration/build.gradle b/test-integration/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..38013cd2472cae0b8f55b6ab002829f4d12fa751
--- /dev/null
+++ b/test-integration/build.gradle
@@ -0,0 +1,5 @@
+apply from: '../build/javaproject.gradle'
+
+dependencies {
+    testImplementation project(':server-application-server'), project(path : ':server-application-server', configuration: 'tests')
+}
\ No newline at end of file
diff --git a/test-integration/etc/log.xml b/test-integration/etc/log.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b5741a11578d2d52bd40125d5f7a843d5d0d9a20
--- /dev/null
+++ b/test-integration/etc/log.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
+
+    <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] %c - %m%n"/>
+        </layout>
+    </appender>
+
+    <appender name="NULL" class="org.apache.log4j.varia.NullAppender" />
+
+    <root>
+        <priority value="info" />
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</log4j:configuration>
diff --git a/test-integration/etc/web-client.properties b/test-integration/etc/web-client.properties
new file mode 100644
index 0000000000000000000000000000000000000000..2ad81d1c9129b5851c239319382e029398668de8
--- /dev/null
+++ b/test-integration/etc/web-client.properties
@@ -0,0 +1,2 @@
+# DON'T DELETE THIS FILE
+# it is needed for DSS system tests which run an openBIS AS instance
diff --git a/test-integration/gradle/wrapper/gradle-wrapper.jar b/test-integration/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5c2d1cf016b3885f6930543d57b744ea8c220a1a
Binary files /dev/null and b/test-integration/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/test-integration/gradle/wrapper/gradle-wrapper.properties b/test-integration/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000000000000000000000000000000000..7745c4ec463c7bb1c4ff6a5e58db239890345152
--- /dev/null
+++ b/test-integration/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://sissource.ethz.ch/openbis/openbis-public/openbis-ivy/-/raw/main/gradle/distribution/7.4/gradle-7.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/test-integration/gradlew b/test-integration/gradlew
new file mode 100755
index 0000000000000000000000000000000000000000..83f2acfdc319a24e8766cca78f32474ad7a22dd6
--- /dev/null
+++ b/test-integration/gradlew
@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/test-integration/gradlew.bat b/test-integration/gradlew.bat
new file mode 100644
index 0000000000000000000000000000000000000000..9618d8d9607cd91a0efb866bcac4810064ba6fac
--- /dev/null
+++ b/test-integration/gradlew.bat
@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/test-integration/settings.gradle b/test-integration/settings.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..a53820b60379f41ff042c52211d2a60bb8f365d1
--- /dev/null
+++ b/test-integration/settings.gradle
@@ -0,0 +1,3 @@
+includeFlat 'lib-commonbase', 'lib-common', 'lib-json', 'lib-authentication', 'lib-transactional-file-system', 'lib-dbmigration', 'lib-openbis-common',
+        'api-openbis-java', 'api-openbis-javascript', 'api-data-store-server-java',
+        'server-application-server', 'server-data-store'
diff --git a/test-integration/source/core-plugins/core-plugins.properties b/test-integration/source/core-plugins/core-plugins.properties
new file mode 100644
index 0000000000000000000000000000000000000000..7f8c73bdd9d3892eee3ce1956821f0776b36d783
--- /dev/null
+++ b/test-integration/source/core-plugins/core-plugins.properties
@@ -0,0 +1 @@
+enabled-modules =
\ No newline at end of file
diff --git a/test-integration/sourceTest/java/ch/ethz/sis/openbis/systemtests/AbstractIntegrationTest.java b/test-integration/sourceTest/java/ch/ethz/sis/openbis/systemtests/AbstractIntegrationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..79e2b28b39589c58b25a284d1a2d12d2a90a46e0
--- /dev/null
+++ b/test-integration/sourceTest/java/ch/ethz/sis/openbis/systemtests/AbstractIntegrationTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package ch.ethz.sis.openbis.systemtests;
+
+import java.lang.reflect.Method;
+
+import org.apache.log4j.Level;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.GenericWebApplicationContext;
+import org.springframework.web.servlet.DispatcherServlet;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeTest;
+
+import ch.systemsx.cisd.common.logging.BufferedAppender;
+import ch.systemsx.cisd.openbis.generic.server.util.TestInitializer;
+import ch.systemsx.cisd.openbis.generic.shared.util.TestInstanceHostUtils;
+import ch.systemsx.cisd.openbis.util.LogRecordingUtils;
+
+/**
+ * @author pkupczyk
+ */
+public abstract class AbstractIntegrationTest
+{
+    protected static GenericWebApplicationContext applicationContext;
+
+    protected BufferedAppender logAppender;
+
+    @BeforeMethod
+    public void beforeTest(Method method)
+    {
+        System.out.println("BEFORE " + render(method));
+        getLogAppender().resetLogContent();
+    }
+
+    @AfterMethod
+    public void afterTest(Method method)
+    {
+        System.out.println("AFTER  " + render(method));
+    }
+
+    private String render(Method method)
+    {
+        return method.getDeclaringClass().getName() + "." + method.getName();
+    }
+
+    @BeforeSuite
+    public void beforeSuite() throws Exception
+    {
+        TestInitializer.initWithIndex();
+
+        Server server = new Server();
+        HttpConfiguration httpConfig = new HttpConfiguration();
+        ServerConnector connector =
+                new ServerConnector(server, new HttpConnectionFactory(httpConfig));
+        connector.setPort(TestInstanceHostUtils.getOpenBISPort());
+        server.addConnector(connector);
+        DispatcherServlet dispatcherServlet = new DispatcherServlet()
+        {
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            protected WebApplicationContext findWebApplicationContext()
+            {
+                XmlBeanFactory f =
+                        new XmlBeanFactory(new FileSystemResource("../server-application-server/resource/server/spring-servlet.xml"));
+                applicationContext = new GenericWebApplicationContext(f);
+                applicationContext.setParent(new ClassPathXmlApplicationContext("classpath:applicationContext.xml"));
+                applicationContext.refresh();
+                return applicationContext;
+            }
+        };
+        ServletContextHandler sch =
+                new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS);
+        sch.addServlet(new ServletHolder(dispatcherServlet), "/*");
+        server.start();
+    }
+
+    @BeforeTest
+    public void setUpLogAppender()
+    {
+        logAppender = LogRecordingUtils.createRecorder();
+    }
+
+    private BufferedAppender getLogAppender()
+    {
+        if (logAppender == null)
+        {
+            logAppender = LogRecordingUtils.createRecorder("%d %p [%t] %c - %m%n", Level.INFO);
+        }
+        return logAppender;
+    }
+
+}
diff --git a/test-integration/sourceTest/java/ch/ethz/sis/openbis/systemtests/IntegrationTest.java b/test-integration/sourceTest/java/ch/ethz/sis/openbis/systemtests/IntegrationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..58dcfeab246ef3ad07e397a93b552c9bc3efe5e2
--- /dev/null
+++ b/test-integration/sourceTest/java/ch/ethz/sis/openbis/systemtests/IntegrationTest.java
@@ -0,0 +1,18 @@
+package ch.ethz.sis.openbis.systemtests;
+
+import org.testng.annotations.Test;
+
+import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
+
+public class IntegrationTest extends AbstractIntegrationTest
+{
+
+    @Test
+    public void helloWorld()
+    {
+        IApplicationServerApi v3 = applicationContext.getBean(IApplicationServerApi.class);
+        String sessionToken = v3.login("test", "password");
+        System.out.println("Session token: " + sessionToken);
+    }
+
+}
diff --git a/test-integration/sourceTest/java/tests.xml b/test-integration/sourceTest/java/tests.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1daf220f31fccd6264173e595015df1aaee4de06
--- /dev/null
+++ b/test-integration/sourceTest/java/tests.xml
@@ -0,0 +1,14 @@
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+
+<suite name="All" verbose="1">
+    <test name="All">
+        <groups>
+            <run>
+                <exclude name="broken" />
+            </run>
+        </groups>
+        <packages>
+            <package name="ch.ethz.sis.openbis.systemtests.*" />
+        </packages>
+    </test>
+</suite>