diff --git a/src/HttpLibrary/__init__.py b/src/HttpLibrary/__init__.py
index ae11328..8e860b8 100644
--- a/src/HttpLibrary/__init__.py
+++ b/src/HttpLibrary/__init__.py
@@ -431,7 +431,7 @@ def set_request_header(self, header_name, header_value):
         """
         logger.info(
             'Set request header "%s" to "%s"' % (header_name, header_value))
-        self.context.request_headers[header_name] = header_value
+        self.context.request_headers[str(header_name)] = header_value
 
     def set_basic_auth(self, username, password):
         """
@@ -471,7 +471,7 @@ def get_response_body(self):
         | ${body}=            | Get Response Body |                                      |
         | Should Start With   | ${body}           | <?xml version="1.0" encoding="UTF-8" |
         """
-        return self.response.body
+        return self.response.body.decode("utf-8")
 
     def response_body_should_contain(self, should_contain):
         """
@@ -483,11 +483,11 @@ def response_body_should_contain(self, should_contain):
         | Response Body Should Contain | encoding="UTF-8" |
         """
         logger.debug('Testing whether "%s" contains "%s".' % (
-            self.response.body, should_contain))
+            self.get_response_body(), should_contain))
 
-        assert should_contain in self.response.body, \
+        assert should_contain in self.get_response_body(), \
             '"%s" should have contained "%s", but did not.' % (
-                self.response.body, should_contain)
+                self.get_response_body(), should_contain)
 
     def log_response_body(self, log_level='INFO'):
         """
@@ -495,9 +495,9 @@ def log_response_body(self, log_level='INFO'):
 
         Specify `log_level` (default: "INFO") to set the log level.
         """
-        if self.response.body:
+        if self.get_response_body():
             logger.write("Response body:", log_level)
-            logger.write(self.response.body, log_level)
+            logger.write(self.get_response_body(), log_level)
         else:
             logger.debug("No response body received", log_level)
 
diff --git a/tests/http/simple.txt b/tests/http/simple.txt
index 827950a..fd08760 100644
--- a/tests/http/simple.txt
+++ b/tests/http/simple.txt
@@ -168,6 +168,23 @@ POST with one word request body
     POST                          /echo
     Response Body Should Contain  Tooot
 
+POST with Unicode request body
+    [Documentation]     Unicode in response body must not break 'should contain'
+    [Tags]  unicode
+    Set Request Body              Tschüss Süße
+    Set Request Header            Content-Type    text/plain
+    POST                          /echo
+    Response Body Should Contain  Tschüss Süße
+
+POST with Unicode request body and Accept Header
+    [Documentation]     Request body and headers must allow to be concatenated
+    [Tags]  unicode
+    Set Request Body              Tschüss Süße
+    Set Request Header            Accept          application/json
+    Set Request Header            Content-Type    text/plain
+    POST                          /echo
+    Response Body Should Contain  Tschüss Süße
+
 PUT with two word request body
     Set Request Body              Tooot Tooooot
     Set Request Header            Content-Type    text/plain