diff --git a/test/src/web/zcl_abapgit_web.clas.abap b/test/src/web/zcl_abapgit_web.clas.abap
index fbe3ef1c8..b11cb9af9 100644
--- a/test/src/web/zcl_abapgit_web.clas.abap
+++ b/test/src/web/zcl_abapgit_web.clas.abap
@@ -20,9 +20,6 @@ CLASS zcl_abapgit_web DEFINITION
     CLASS-DATA gi_request  TYPE REF TO zif_abapgit_web_request.
     CLASS-DATA gi_response TYPE REF TO zif_abapgit_web_response.
 
-    CLASS-METHODS initialize
-      RAISING
-        zcx_abapgit_exception.
     CLASS-METHODS sapevent.
     CLASS-METHODS redirect.
     CLASS-METHODS search_asset
@@ -46,7 +43,15 @@ CLASS zcl_abapgit_web IMPLEMENTATION.
     gi_response = ii_response.
 
     IF go_viewer IS INITIAL.
-      initialize( ).
+      zcl_abapgit_web_setup=>setup( ).
+
+      CREATE OBJECT go_viewer
+        EXPORTING
+          ii_request  = ii_request
+          ii_response = ii_response.
+      zcl_abapgit_ui_core_injector=>set_html_viewer( go_viewer ).
+
+      go_gui = zcl_abapgit_ui_factory=>get_gui( ).
     ENDIF.
 
     lv_found = search_asset( ).
@@ -70,36 +75,6 @@ CLASS zcl_abapgit_web IMPLEMENTATION.
 
   ENDMETHOD.
 
-
-  METHOD initialize.
-
-    DATA lo_environment TYPE REF TO zcl_abapgit_web_environment.
-    DATA lo_cts_api TYPE REF TO zcl_abapgit_web_cts_api.
-    DATA lo_user_record TYPE REF TO zcl_abapgit_web_user_record.
-
-    zcl_abapgit_web_inject_fm=>inject( ).
-
-    CREATE OBJECT lo_environment.
-    zcl_abapgit_injector=>set_environment( lo_environment ).
-
-    CREATE OBJECT lo_cts_api.
-    zcl_abapgit_injector=>set_cts_api( lo_cts_api ).
-
-    CREATE OBJECT lo_user_record.
-    zcl_abapgit_env_injector=>set_user_record( lo_user_record ).
-
-    CREATE OBJECT go_viewer
-      EXPORTING
-        ii_request  = gi_request
-        ii_response = gi_response.
-    zcl_abapgit_ui_core_injector=>set_html_viewer( go_viewer ).
-
-
-    go_gui = zcl_abapgit_ui_factory=>get_gui( ).
-
-  ENDMETHOD.
-
-
   METHOD redirect.
 
     DATA lv_html TYPE string.
diff --git a/test/src/web/zcl_abapgit_web_setup.clas.abap b/test/src/web/zcl_abapgit_web_setup.clas.abap
new file mode 100644
index 000000000..61c77d6d0
--- /dev/null
+++ b/test/src/web/zcl_abapgit_web_setup.clas.abap
@@ -0,0 +1,27 @@
+CLASS zcl_abapgit_web_setup DEFINITION PUBLIC.
+  PUBLIC SECTION.
+    CLASS-METHODS setup
+    RAISING
+      zcx_abapgit_exception.
+ENDCLASS.
+
+CLASS zcl_abapgit_web_setup IMPLEMENTATION.
+  METHOD setup.
+
+    DATA lo_environment TYPE REF TO zcl_abapgit_web_environment.
+    DATA lo_cts_api     TYPE REF TO zcl_abapgit_web_cts_api.
+    DATA lo_user_record TYPE REF TO zcl_abapgit_web_user_record.
+
+    zcl_abapgit_web_inject_fm=>inject( ).
+
+    CREATE OBJECT lo_environment.
+    zcl_abapgit_injector=>set_environment( lo_environment ).
+
+    CREATE OBJECT lo_cts_api.
+    zcl_abapgit_injector=>set_cts_api( lo_cts_api ).
+
+    CREATE OBJECT lo_user_record.
+    zcl_abapgit_env_injector=>set_user_record( lo_user_record ).
+
+  ENDMETHOD.
+ENDCLASS.
diff --git a/test/src/web/zcl_abapgit_web_setup.clas.xml b/test/src/web/zcl_abapgit_web_setup.clas.xml
new file mode 100644
index 000000000..dfd8f6513
--- /dev/null
+++ b/test/src/web/zcl_abapgit_web_setup.clas.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <VSEOCLASS>
+    <CLSNAME>ZCL_ABAPGIT_WEB_SETUP</CLSNAME>
+    <LANGU>E</LANGU>
+    <DESCRIPT>ZCL_ABAPGIT_WEB_SETUP</DESCRIPT>
+    <STATE>1</STATE>
+    <CLSCCINCL>X</CLSCCINCL>
+    <FIXPT>X</FIXPT>
+    <UNICODE>X</UNICODE>
+   </VSEOCLASS>
+  </asx:values>
+ </asx:abap>
+</abapGit>
\ No newline at end of file