diff --git a/build-tests/s390/suse/test-image-oem/appliance.kiwi b/build-tests/s390/suse/test-image-oem/appliance.kiwi
index 82b7dbea..4b2abb74 100644
--- a/build-tests/s390/suse/test-image-oem/appliance.kiwi
+++ b/build-tests/s390/suse/test-image-oem/appliance.kiwi
@@ -14,7 +14,7 @@
         <locale>en_US</locale>
         <keytable>us</keytable>
         <timezone>Europe/Berlin</timezone>
-        <type image="oem" filesystem="btrfs" initrd_system="dracut" bootloader="grub2_s390x_emu" target_blocksize="4096" zipl_targettype="CDL" kernelcmdline="cio_ignore=all,!ipldev,!condev">
+        <type image="oem" filesystem="xfs" initrd_system="dracut" bootloader="grub2_s390x_emu" target_blocksize="4096" zipl_targettype="CDL" kernelcmdline="cio_ignore=all,!ipldev,!condev" bootloader_console="serial">
             <size unit="G">20</size>
             <systemdisk>
                 <volume name="home"/>
diff --git a/build-tests/s390/suse/test-image-oem/config.sh b/build-tests/s390/suse/test-image-oem/config.sh
index 3968775b..e11f2667 100644
--- a/build-tests/s390/suse/test-image-oem/config.sh
+++ b/build-tests/s390/suse/test-image-oem/config.sh
@@ -10,48 +10,17 @@ test -f /.profile && . /.profile
 #--------------------------------------
 echo "Configure image: [$kiwi_iname]..."
 
-#======================================
-# Mount system filesystems
-#--------------------------------------
-baseMount
-
-#======================================
-# Activate services
-#--------------------------------------
-suseActivateDefaultServices
-suseRemoveService gpm
-suseRemoveService nfs
-suseRemoveService boot.cpi
-
 #======================================
 # Setup baseproduct link
 #--------------------------------------
 suseSetupProduct
 
 #======================================
-# Add missing gpg keys to rpm
+# Activate services
 #--------------------------------------
-suseImportBuildKey
+suseInsertService sshd
 
 #======================================
-# Remove all documentation
+# Setup default target, multi-user
 #--------------------------------------
-baseStripDocs
-
-#======================================
-# only basic version of vim is
-# installed; no syntax highlighting
-#--------------------------------------
-sed -i -e's/^syntax on/" syntax on/' /etc/vimrc
-
-#======================================
-# SuSEconfig
-#--------------------------------------
-suseConfig
-
-#======================================
-# Umount kernel filesystems
-#--------------------------------------
-baseCleanMount
-
-exit 0
+baseSetRunlevel 3
diff --git a/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/dasd/01-network.sh b/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/dasd/01-network.sh
deleted file mode 100755
index b248ea88..00000000
--- a/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/dasd/01-network.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-# s390 network hardware setup
-# ----
-#======================================
-# Functions...
-#--------------------------------------
-. /include
-
-portname=VSWL2
-readchannel=0.0.0800
-writechannel=0.0.0801
-datachannel=0.0.0802
-qeth_up=1
-
-#======================================
-# Include kernel parameters
-#--------------------------------------
-includeKernelParameters
-
-#======================================
-# Bring the device online
-#--------------------------------------
-qeth_configure -p $portname -l \
-    $readchannel $writechannel $datachannel $qeth_up
-
diff --git a/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/zfcp/01-network.sh b/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/zfcp/01-network.sh
deleted file mode 100755
index b248ea88..00000000
--- a/build-tests/s390/suse/test-image-oem/root/etc/init.d/kiwi/zfcp/01-network.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-# s390 network hardware setup
-# ----
-#======================================
-# Functions...
-#--------------------------------------
-. /include
-
-portname=VSWL2
-readchannel=0.0.0800
-writechannel=0.0.0801
-datachannel=0.0.0802
-qeth_up=1
-
-#======================================
-# Include kernel parameters
-#--------------------------------------
-includeKernelParameters
-
-#======================================
-# Bring the device online
-#--------------------------------------
-qeth_configure -p $portname -l \
-    $readchannel $writechannel $datachannel $qeth_up
-
diff --git a/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/network/ifcfg-eth0 b/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/network/ifcfg-eth0
deleted file mode 100644
index b01f9e19..00000000
--- a/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/network/ifcfg-eth0
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOTPROTO='dhcp'
-MTU=''
-REMOTE_IPADDR=''
-STARTMODE='onboot'
diff --git a/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/syslog b/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/syslog
deleted file mode 100644
index c26d0d3e..00000000
--- a/build-tests/s390/suse/test-image-oem/root/etc/sysconfig/syslog
+++ /dev/null
@@ -1,49 +0,0 @@
-## Path:    System/Logging
-## Description:   System logging
-## Type:    list(0,1,2,3,4,5,6,7)
-## Default:   1
-## Config:    ""
-## ServiceRestart:  syslog
-#
-# Default loglevel for klogd
-#
-KERNEL_LOGLEVEL=7
-
-## Type:    string
-## Default:   ""
-## Config:    ""
-## ServiceRestart:  syslog
-#
-# if not empty: parameters for syslogd
-# for example SYSLOGD_PARAMS="-r -s my.dom.ain"
-#
-SYSLOGD_PARAMS=""
-
-## Type:    string
-## Default:   -x
-## Config:    ""
-## ServiceRestart:  syslog
-#
-# if not empty: parameters for klogd
-# for example KLOGD_PARAMS="-x" to avoid (duplicate) symbol resolution
-#
-KLOGD_PARAMS="-x"
-
-## Type:    list(syslogd,syslog-ng,"")
-## Default:   ""
-## Config:    ""
-## ServiceRestart:  syslog
-#
-# The name of the syslog daemon to use as syslog service:
-# "syslogd", "syslog-ng" or "" for autodetect.
-#
-SYSLOG_DAEMON=""
-
-## Type:           string
-## Default:        ""
-## Config:         ""
-## ServiceRestart: syslog
-#
-# Parameters for Syslog New-Generation - see syslog-ng(8)
-#
-SYSLOG_NG_PARAMS=""
diff --git a/build-tests/s390/suse/test-image-vmx/appliance.kiwi b/build-tests/s390/suse/test-image-vmx/appliance.kiwi
new file mode 100644
index 00000000..c0fef789
--- /dev/null
+++ b/build-tests/s390/suse/test-image-vmx/appliance.kiwi
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<image schemaversion="7.1" name="VMX-openSUSE-Tumbleweed">
+    <description type="system">
+        <author>Marcus Schäfer</author>
+        <contact>ms@suse.com</contact>
+        <specification>vmx disk s390 test build to run in kvm</specification>
+    </description>
+    <preferences>
+        <version>1.15.1</version>
+        <packagemanager>zypper</packagemanager>
+        <locale>en_US</locale>
+        <keytable>us</keytable>
+        <timezone>Europe/Berlin</timezone>
+        <rpm-excludedocs>true</rpm-excludedocs>
+        <rpm-check-signatures>false</rpm-check-signatures>
+        <type image="vmx" filesystem="ext4" bootloader="grub2_s390x_emu" kernelcmdline="console=ttyS0" bootloader_console="serial" zipl_targettype="SCSI" format="qcow2"/>
+    </preferences>
+    <users>
+        <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
+    </users>
+    <repository type="rpm-md" >
+        <source path='obsrepositories:/'/>
+    </repository>
+    <packages type="image">
+        <package name="patterns-base-minimal_base"/>
+        <package name="bind-utils"/>
+        <package name="systemd"/>
+        <package name="ifplugd"/>
+        <package name="iputils"/>
+        <package name="vim"/>
+        <package name="grub2"/>
+        <package name="grub2-s390x-emu"/>
+        <package name="lvm2"/>
+        <package name="plymouth"/>
+        <package name="fontconfig"/>
+        <package name="fonts-config"/>
+        <package name="tar"/>
+        <package name="parted"/>
+        <package name="openssh"/>
+        <package name="iproute2"/>
+        <package name="less"/>
+        <package name="bash-completion"/>
+        <package name="dhcp-client"/>
+        <package name="which"/>
+        <package name="kernel-default"/>
+        <package name="timezone"/>
+        <package name="s390-tools"/>
+    </packages>
+    <packages type="bootstrap">
+        <package name="udev"/>
+        <package name="filesystem"/>
+        <package name="glibc-locale"/>
+        <package name="cracklib-dict-full"/>
+        <package name="ca-certificates"/>
+        <package name="openSUSE-release"/>
+        <package name="openSUSE-release-dvd"/>
+    </packages>
+</image>
diff --git a/build-tests/s390/suse/test-image-vmx/config.sh b/build-tests/s390/suse/test-image-vmx/config.sh
new file mode 100644
index 00000000..3f41e7cf
--- /dev/null
+++ b/build-tests/s390/suse/test-image-vmx/config.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+#================
+# FILE          : config.sh
+#----------------
+# PROJECT       : OpenSuSE KIWI Image System
+# COPYRIGHT     : (c) 2006 SUSE LINUX Products GmbH. All rights reserved
+#               :
+# AUTHOR        : Marcus Schaefer <ms@suse.de>
+#               :
+# BELONGS TO    : Operating System images
+#               :
+# DESCRIPTION   : configuration script for SUSE based
+#               : operating systems
+#               :
+#               :
+# STATUS        : BETA
+#----------------
+#======================================
+# Functions...
+#--------------------------------------
+test -f /.kconfig && . /.kconfig
+test -f /.profile && . /.profile
+
+#======================================
+# Greeting...
+#--------------------------------------
+echo "Configure image: [$kiwi_iname]..."
+
+#======================================
+# Setup baseproduct link
+#--------------------------------------
+suseSetupProduct
+
+#======================================
+# Activate services
+#--------------------------------------
+suseInsertService sshd
+
+#======================================
+# Setup default target, multi-user
+#--------------------------------------
+baseSetRunlevel 3