diff --git a/oshdb-api/src/main/java/org/heigit/bigspatialdata/oshdb/api/db/OSHDBIgnite.java b/oshdb-api/src/main/java/org/heigit/bigspatialdata/oshdb/api/db/OSHDBIgnite.java
index ef7cdb3c9..7b2475fd3 100644
--- a/oshdb-api/src/main/java/org/heigit/bigspatialdata/oshdb/api/db/OSHDBIgnite.java
+++ b/oshdb-api/src/main/java/org/heigit/bigspatialdata/oshdb/api/db/OSHDBIgnite.java
@@ -8,6 +8,7 @@
 import java.util.stream.Stream;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.ClusterState;
 import org.apache.ignite.lang.IgniteRunnable;
 import org.heigit.bigspatialdata.oshdb.api.mapreducer.MapReducer;
 import org.heigit.bigspatialdata.oshdb.api.mapreducer.backend.MapReducerIgniteAffinityCall;
@@ -39,7 +40,7 @@ public OSHDBIgnite() {
 
   public OSHDBIgnite(Ignite ignite) {
     this.ignite = ignite;
-    this.ignite.cluster().active(true);
+    this.ignite.cluster().state(ClusterState.ACTIVE_READ_ONLY);
   }
 
   public OSHDBIgnite(String igniteConfigFilePath) {
@@ -53,9 +54,8 @@ public OSHDBIgnite(String igniteConfigFilePath) {
    */
   public OSHDBIgnite(File igniteConfig) {
     Ignition.setClientMode(true);
-
     this.ignite = Ignition.start(igniteConfig.toString());
-    this.ignite.cluster().active(true);
+    this.ignite.cluster().state(ClusterState.ACTIVE_READ_ONLY);
   }
 
   @Override
diff --git a/oshdb-api/src/test/java/org/heigit/bigspatialdata/oshdb/api/tests/TestMapReduceOSHDB_Ignite.java b/oshdb-api/src/test/java/org/heigit/bigspatialdata/oshdb/api/tests/TestMapReduceOSHDB_Ignite.java
index 808c22bfb..1ffa8a2cc 100644
--- a/oshdb-api/src/test/java/org/heigit/bigspatialdata/oshdb/api/tests/TestMapReduceOSHDB_Ignite.java
+++ b/oshdb-api/src/test/java/org/heigit/bigspatialdata/oshdb/api/tests/TestMapReduceOSHDB_Ignite.java
@@ -1,28 +1,50 @@
 package org.heigit.bigspatialdata.oshdb.api.tests;
 
-import java.io.File;
+import static org.junit.Assert.fail;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.List;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteDataStreamer;
 import org.apache.ignite.Ignition;
 import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cluster.ClusterState;
+import org.apache.ignite.configuration.BinaryConfiguration;
 import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.logger.slf4j.Slf4jLogger;
+import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.heigit.bigspatialdata.oshdb.api.db.OSHDBH2;
 import org.heigit.bigspatialdata.oshdb.api.db.OSHDBIgnite;
 import org.heigit.bigspatialdata.oshdb.grid.GridOSHNodes;
 import org.heigit.bigspatialdata.oshdb.util.CellId;
 import org.heigit.bigspatialdata.oshdb.util.TableNames;
-import static org.junit.Assert.fail;
 
 abstract class TestMapReduceOSHDB_Ignite extends TestMapReduce {
-  final static Ignite ignite =
-      Ignition.start(new File("./src/test/resources/ignite-config.xml").toString());
+  final static Ignite ignite;
+  static {
+    int rndPort = 47577 + (int) (Math.random() * 1000);
+    IgniteConfiguration cfg = new IgniteConfiguration();
+    cfg.setPeerClassLoadingEnabled(true);
+    cfg.setIgniteInstanceName("OSHDB-Unit-Tests_" + rndPort);
+    cfg.setBinaryConfiguration((new BinaryConfiguration()).setCompactFooter(false));
+    cfg.setGridLogger(new Slf4jLogger());
+    cfg.setWorkDirectory("/tmp");
+    cfg.setDiscoverySpi((new TcpDiscoverySpi())
+        .setLocalPort(rndPort)
+        .setLocalPortRange(0)
+        .setIpFinder((new TcpDiscoveryVmIpFinder()).setAddresses(List.of("127.0.0.1:" + rndPort)))
+    );
+    ignite = Ignition.start(cfg);
+  }
 
   public TestMapReduceOSHDB_Ignite(OSHDBIgnite oshdb) throws Exception {
     super(oshdb);
@@ -34,7 +56,7 @@ public TestMapReduceOSHDB_Ignite(OSHDBIgnite oshdb) throws Exception {
     this.keytables = oshdb_h2;
 
     Ignite ignite = ((OSHDBIgnite) this.oshdb).getIgnite();
-    ignite.cluster().active(true);
+    ignite.cluster().state(ClusterState.ACTIVE);
 
     CacheConfiguration<Long, GridOSHNodes> cacheCfg =
         new CacheConfiguration<>(TableNames.T_NODES.toString(prefix));
diff --git a/oshdb-api/src/test/resources/ignite-config.xml b/oshdb-api/src/test/resources/ignite-config.xml
deleted file mode 100644
index 7f5925615..000000000
--- a/oshdb-api/src/test/resources/ignite-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd">
-  <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
-
-    <property name="igniteInstanceName" value="OSHDB-Unit-Tests" />
-
-    <!-- Set to true to enable distributed class loading for examples, default is false. -->
-    <property name="peerClassLoadingEnabled" value="false" />
-
-    <property name="binaryConfiguration">
-      <bean class="org.apache.ignite.configuration.BinaryConfiguration">
-        <property name="compactFooter" value="false" />
-      </bean>
-    </property>
-
-    <property name="marshaller">
-      <bean class="org.apache.ignite.marshaller.jdk.JdkMarshaller" />
-    </property>
-
-    <property name="gridLogger">
-      <bean class="org.apache.ignite.logger.slf4j.Slf4jLogger"/>
-    </property>
-
-    <property name="workDirectory" value="/tmp" />
-
-    <!-- Explicitly configure TCP discovery SPI to provide list of initial
-    nodes. -->
-    <property name="discoverySpi">
-      <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
-        <property name="localPort" value="47577"/>
-        <property name="ipFinder">
-          <!-- Ignite provides several options for automatic discovery that can
-          be used instead os static IP based discovery. For information on all options
-          refer to our documentation: http://apacheignite.readme.io/docs/cluster-config -->
-          <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">
-            <property name="addresses">
-              <list>
-                <!-- In distributed environment, replace with actual host IP address.-->
-                <value>127.0.0.1:47577</value>
-              </list>
-            </property>
-          </bean>
-        </property>
-      </bean>
-    </property>
-  </bean>
-</beans>
\ No newline at end of file