diff --git a/os_brick/initiator/connector.py b/os_brick/initiator/connector.py
index 2c41d7e50..7c71f2a72 100644
--- a/os_brick/initiator/connector.py
+++ b/os_brick/initiator/connector.py
@@ -25,6 +25,7 @@ import os
 import platform
 import re
 import socket
+import sys
 import time
 
 from oslo_concurrency import lockutils
@@ -99,6 +100,8 @@ def get_connector_properties(root_helper, my_ip, multipath, enforce_multipath,
     props['multipath'] = (multipath and
                           _check_multipathd_running(root_helper,
                                                     enforce_multipath))
+    props['platform'] = platform.machine()
+    props['os_type'] = sys.platform
     return props
 
 
diff --git a/os_brick/tests/initiator/test_connector.py b/os_brick/tests/initiator/test_connector.py
index 8d3c253cd..9e7f6601e 100644
--- a/os_brick/tests/initiator/test_connector.py
+++ b/os_brick/tests/initiator/test_connector.py
@@ -13,6 +13,7 @@
 #    under the License.
 
 import os.path
+import platform
 import string
 import tempfile
 import time
@@ -46,6 +47,8 @@ class ConnectorUtilsTestCase(base.TestCase):
                        return_value=None)
     @mock.patch.object(linuxfc.LinuxFibreChannel, 'get_fc_wwnns',
                        return_value=None)
+    @mock.patch.object(platform, 'machine', mock.Mock(return_value='s390x'))
+    @mock.patch('sys.platform', 'linux2')
     def _test_brick_get_connector_properties(self, multipath,
                                              enforce_multipath,
                                              multipath_result,
@@ -57,10 +60,14 @@ class ConnectorUtilsTestCase(base.TestCase):
                                                           multipath,
                                                           enforce_multipath,
                                                           host=host)
+        os_type = 'linux2'
+        platform = 's390x'
         props = {'initiator': 'fakeinitiator',
                  'host': host,
                  'ip': MY_IP,
-                 'multipath': multipath_result}
+                 'multipath': multipath_result,
+                 'os_type': os_type,
+                 'platform': platform}
         self.assertEqual(props, props_actual)
 
     def test_brick_get_connector_properties(self):