diff --git a/tests/msb/rest-service-api-gateway/__init__.robot b/tests/msb/rest-service-api-gateway/__init__.robot
new file mode 100644
index 0000000..efd2221
--- /dev/null
+++ b/tests/msb/rest-service-api-gateway/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    Microservices Service Bus - Messag Broker
diff --git a/tests/msb/rest-service-api-gateway/test1.robot b/tests/msb/rest-service-api-gateway/test1.robot
new file mode 100644
index 0000000..8a15bf2
--- /dev/null
+++ b/tests/msb/rest-service-api-gateway/test1.robot
@@ -0,0 +1,9 @@
+*** Settings ***
+Library  Collections
+Library  requests
+
+*** Test Cases ***
+REST service Test1
+    [Documentation]            Check if test rest service can be accessed via aip gateway
+    ${result} =  get           http://${MSB_IAG_IP}/api/test/v1/people
+    Should Be Equal            ${result.status_code}       ${200}
diff --git a/tests/msb/rest-service-discovery/__init__.robot b/tests/msb/rest-service-discovery/__init__.robot
new file mode 100644
index 0000000..efd2221
--- /dev/null
+++ b/tests/msb/rest-service-discovery/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    Microservices Service Bus - Messag Broker
diff --git a/tests/msb/rest-service-discovery/test1.robot b/tests/msb/rest-service-discovery/test1.robot
new file mode 100644
index 0000000..bb48d3f
--- /dev/null
+++ b/tests/msb/rest-service-discovery/test1.robot
@@ -0,0 +1,14 @@
+*** Settings ***
+Library  Collections
+Library  requests
+
+*** Test Cases ***
+Messag Broker Test
+    [Documentation]            Check if the test service enpoint can be get from MSB
+    ${result} =  get           http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services/test/version/v1
+    Should Be Equal            ${result.status_code}       ${200}
+	${json} =                  Set Variable                ${result.json()}
+    ${serviceName} =           Get From Dictionary         ${json}              serviceName
+    ${protocol} =              Get From Dictionary         ${json}              protocol
+    Should Be Equal            ${serviceName}              test
+    Should Be Equal            ${protocol}                 REST  
\ No newline at end of file
diff --git a/tests/msb/startup/__init__.robot b/tests/msb/startup/__init__.robot
new file mode 100644
index 0000000..2f64526
--- /dev/null
+++ b/tests/msb/startup/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    Microservices Service Bus - Startup
diff --git a/tests/msb/startup/test1.robot b/tests/msb/startup/test1.robot
new file mode 100644
index 0000000..99ad603
--- /dev/null
+++ b/tests/msb/startup/test1.robot
@@ -0,0 +1,16 @@
+*** Settings ***
+Library       RequestsLibrary
+
+*** Test Cases ***
+Liveness Test
+    [Documentation]        Check various endpoints for basic liveness check
+    Create Session         msb              http://${MSB_IAG_IP}:80
+    CheckUrl               msb              /msb
+    CheckUrl               msb              /iui/microservices/default.html
+
+*** Keywords ***
+CheckUrl
+    [Arguments]                   ${session}  ${path}
+    ${resp}=                      Get Request          ${session}  ${path}
+    Should Be Equal As Integers   ${resp.status_code}  200
+
diff --git a/tests/msb/tcp-service-access/__init__.robot b/tests/msb/tcp-service-access/__init__.robot
new file mode 100644
index 0000000..efd2221
--- /dev/null
+++ b/tests/msb/tcp-service-access/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    Microservices Service Bus - Messag Broker
diff --git a/tests/msb/tcp-service-access/test1.robot b/tests/msb/tcp-service-access/test1.robot
new file mode 100644
index 0000000..e84c7e1
--- /dev/null
+++ b/tests/msb/tcp-service-access/test1.robot
@@ -0,0 +1,16 @@
+*** Settings ***
+Library  Collections
+Library  requests
+
+*** Test Cases ***
+Messag Broker Test1
+    [Documentation]            Check if ActiveMQ index page can be accessed
+    ${result} =  get           http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services/ActiveMQ/version/null
+    Should Be Equal            ${result.status_code}       ${200}
+	${json} =                  Set Variable                ${result.json()}
+    ${activeMQ_ip} =           Set Variable                ${json["nodes"][0]["ip"]}
+    ${activeMQ_port} =         Set Variable                ${json["nodes"][0]["port"]}
+
+    ${result} =  get           http://${activeMQ_ip}:8161
+    Should Be Equal            ${result.status_code}       ${200}
+
diff --git a/tests/msb/tcp-service-access/test2.robot b/tests/msb/tcp-service-access/test2.robot
new file mode 100644
index 0000000..58e5471
--- /dev/null
+++ b/tests/msb/tcp-service-access/test2.robot
@@ -0,0 +1,15 @@
+*** Settings ***
+Library  Collections
+Library  requests
+Library  Telnet 
+
+*** Test Cases ***
+Messag Broker Test2
+    [Documentation]            Check if ActiveMQ listening port can be accessed
+    ${result} =  get           http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services/ActiveMQ/version/null
+    Should Be Equal            ${result.status_code}       ${200}
+	${json} =                  Set Variable                ${result.json()}
+    ${activeMQ_ip} =           Set Variable                ${json["nodes"][0]["ip"]}
+    ${activeMQ_port} =         Set Variable                ${json["nodes"][0]["port"]}
+    
+    Open Connection            ${activeMQ_ip}              port=${activeMQ_port}              
diff --git a/tests/msb/tcp-service-discovery/__init__.robot b/tests/msb/tcp-service-discovery/__init__.robot
new file mode 100644
index 0000000..efd2221
--- /dev/null
+++ b/tests/msb/tcp-service-discovery/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    Microservices Service Bus - Messag Broker
diff --git a/tests/msb/tcp-service-discovery/test1.robot b/tests/msb/tcp-service-discovery/test1.robot
new file mode 100644
index 0000000..da6cb3e
--- /dev/null
+++ b/tests/msb/tcp-service-discovery/test1.robot
@@ -0,0 +1,14 @@
+*** Settings ***
+Library  Collections
+Library  requests
+
+*** Test Cases ***
+Messag Broker Test
+    [Documentation]            Check if the message broker enpoint can be get from MSB
+    ${result} =  get           http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services/ActiveMQ/version/null
+    Should Be Equal            ${result.status_code}       ${200}
+	${json} =                  Set Variable                ${result.json()}
+    ${serviceName} =           Get From Dictionary         ${json}              serviceName
+    ${protocol} =              Get From Dictionary         ${json}              protocol
+    Should Be Equal            ${serviceName}              ActiveMQ
+    Should Be Equal            ${protocol}                 TCP  
\ No newline at end of file