diff --git a/services/amqp-bridge/mapping/src/main/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/MessageMapper.java b/services/amqp-bridge/mapping/src/main/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/MessageMapper.java
index d56102e2da..e208162c10 100644
--- a/services/amqp-bridge/mapping/src/main/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/MessageMapper.java
+++ b/services/amqp-bridge/mapping/src/main/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/MessageMapper.java
@@ -132,7 +132,6 @@ public static Optional<String> findContentType(final Adaptable adaptable) {
      * @throws IllegalArgumentException if the configuration is invalid.
      */
     public final void configure(final MessageMapperConfiguration configuration){
-        checkNotNull(configuration);
         doConfigure(configuration);
 
         final boolean isContentTypeRequiredValue = configuration.findProperty(OPT_CONTENT_TYPE_REQUIRED).map
diff --git a/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperBytesTest.java b/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperBytesTest.java
index 338c5b8dba..805d1a1009 100644
--- a/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperBytesTest.java
+++ b/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperBytesTest.java
@@ -22,6 +22,7 @@
 import org.eclipse.ditto.protocoladapter.DittoProtocolAdapter;
 import org.eclipse.ditto.signals.commands.things.modify.CreateThing;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -30,6 +31,7 @@
  * Sorry, not really a test yet - class was used in order to manually test mapping functionality.
  */
 //@RunWith(Parameterized.class)
+@Ignore
 public class PayloadMapperBytesTest {
 
     private static final String MAPPING_TEMPLATE = "ditto_mappingByteArray = [];" +
diff --git a/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperMustacheTest.java b/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperMustacheTest.java
index 316929e2c6..26e8079e43 100644
--- a/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperMustacheTest.java
+++ b/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperMustacheTest.java
@@ -18,6 +18,7 @@
 import org.eclipse.ditto.protocoladapter.DittoProtocolAdapter;
 import org.eclipse.ditto.signals.commands.things.modify.CreateThing;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -26,6 +27,7 @@
  * Sorry, not really a test yet - class was used in order to manually test mapping functionality.
  */
 //@RunWith(Parameterized.class)
+@Ignore
 public class PayloadMapperMustacheTest {
 
     private static final String CONTENT_TYPE = "application/json";
diff --git a/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperSimpleTest.java b/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperSimpleTest.java
index 8cb0aa502a..d3f48235f7 100644
--- a/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperSimpleTest.java
+++ b/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/PayloadMapperSimpleTest.java
@@ -18,6 +18,7 @@
 import org.eclipse.ditto.protocoladapter.DittoProtocolAdapter;
 import org.eclipse.ditto.signals.commands.things.modify.CreateThing;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -26,6 +27,7 @@
  * Sorry, not really a test yet - class was used in order to manually test mapping functionality.
  */
 //@RunWith(Parameterized.class)
+@Ignore
 public class PayloadMapperSimpleTest {
 
     private static final String MAPPING_TEMPLATE = "ditto_mappingString = " +
diff --git a/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/ProtocolToRawMapperBytesTest.java b/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/ProtocolToRawMapperBytesTest.java
index 64a1c5a52f..2c750869a6 100644
--- a/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/ProtocolToRawMapperBytesTest.java
+++ b/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/ProtocolToRawMapperBytesTest.java
@@ -18,6 +18,7 @@
 
 import org.eclipse.ditto.protocoladapter.Adaptable;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -26,6 +27,7 @@
  * Sorry, not really a test yet - class was used in order to manually test mapping functionality.
  */
 //@RunWith(Parameterized.class)
+@Ignore
 public class ProtocolToRawMapperBytesTest {
 
     private static final String CONTENT_TYPE = "application/octet-stream";
diff --git a/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/ProtocolToRawMapperSimpleTest.java b/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/ProtocolToRawMapperSimpleTest.java
index e20e270c1e..7e2792378e 100644
--- a/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/ProtocolToRawMapperSimpleTest.java
+++ b/services/amqp-bridge/mapping/src/test/java/org/eclipse/ditto/services/amqpbridge/mapping/mapper/ProtocolToRawMapperSimpleTest.java
@@ -16,6 +16,7 @@
 
 import org.eclipse.ditto.protocoladapter.Adaptable;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -24,6 +25,7 @@
  * Sorry, not really a test yet - class was used in order to manually test mapping functionality.
  */
 //@RunWith(Parameterized.class)
+@Ignore
 public class ProtocolToRawMapperSimpleTest {
 
     private static final String CONTENT_TYPE = "text/plain";