diff --git a/workspace_tools/compliance/ioper_runner.py b/workspace_tools/compliance/ioper_runner.py
index 5fd19060ae..223d0acedd 100644
--- a/workspace_tools/compliance/ioper_runner.py
+++ b/workspace_tools/compliance/ioper_runner.py
@@ -31,14 +31,16 @@ except:
 COLORAMA = 'colorama' in sys.modules
 
 from ioper_base import IOperTestCaseBase
-from ioper_test_fs import IOperTest_FileStructure
+from ioper_test_fs import IOperTest_FileStructure_Basic
+from ioper_test_fs import IOperTest_FileStructure_MbedEnabled
 from ioper_test_target_id import IOperTest_TargetID_Basic
 from ioper_test_target_id import IOperTest_TargetID_MbedEnabled
 
 
 TEST_LIST = [IOperTest_TargetID_Basic('basic'),
              IOperTest_TargetID_MbedEnabled('mbed-enabled'),
-             IOperTest_FileStructure('basic'),
+             IOperTest_FileStructure_Basic('basic'),
+             IOperTest_FileStructure_MbedEnabled('mbed-enabled'),
              IOperTestCaseBase('all'),  # Dummy used to add 'all' option
             ]
 
diff --git a/workspace_tools/compliance/ioper_test_fs.py b/workspace_tools/compliance/ioper_test_fs.py
index db6090acb2..1d8a117682 100644
--- a/workspace_tools/compliance/ioper_test_fs.py
+++ b/workspace_tools/compliance/ioper_test_fs.py
@@ -35,11 +35,34 @@ class IOperTest_FileStructure(IOperTestCaseBase):
         else:
             self.result.append((fail_severity if fail_severity else self.ERROR, self.scope, "File '%s' not found" % file_path))
 
+    def test(self, param=None):
+        self.result = []
+        if param:
+            pass
+        return self.result
+
+
+class IOperTest_FileStructure_Basic(IOperTest_FileStructure):
+    def __init__(self, scope=None):
+        IOperTest_FileStructure.__init__(self, scope)
+
     def test(self, param=None):
         self.param = param
         self.result = []
         if param:
             self.if_file_exist('mbed.htm', self.ERROR)
-            self.if_file_exist('DETAILS.TXT', self.INFO)
+        return self.result
+
+
+class IOperTest_FileStructure_MbedEnabled(IOperTest_FileStructure):
+    def __init__(self, scope=None):
+        IOperTest_FileStructure.__init__(self, scope)
+
+    def test(self, param=None):
+        self.param = param
+        self.result = []
+        if param:
+            self.if_file_exist('mbed.htm', self.ERROR)
+            self.if_file_exist('DETAILS.TXT', self.ERROR)
             self.if_file_exist('FAIL.TXT', self.INFO)
         return self.result