diff --git a/suite/disasm_mc.py b/suite/disasm_mc.py
new file mode 100755
index 00000000..ff5875a9
--- /dev/null
+++ b/suite/disasm_mc.py
@@ -0,0 +1,188 @@
+#!/usr/bin/python
+# Test tool to disassemble MC files. By Nguyen Anh Quynh, 2017
+import array, os.path, sys
+from capstone import *
+
+
+# convert all hex numbers to decimal numbers in a text
+def normalize_hex(a):
+    while(True):
+        i = a.find('0x')
+        if i == -1: # no more hex number
+            break
+        hexnum = '0x'
+        for c in a[i + 2:]:
+            if c in '0123456789abcdefABCDEF':
+                hexnum += c
+            else:
+                break
+        num = int(hexnum, 16)
+        a = a.replace(hexnum, str(num))
+    return a
+
+
+def test_file(fname):
+    print("Test %s" %fname);
+    f = open(fname)
+    lines = f.readlines()
+    f.close()
+
+    if not lines[0].startswith('# '):
+        print("ERROR: decoding information is missing")
+        return
+
+    # skip '# ' at the front, then split line to get out hexcode
+    # Note: option can be '', or 'None'
+    #print lines[0]
+    #print lines[0][2:].split(', ')
+    (arch, mode, option) = lines[0][2:].split(', ')
+    mode = mode.replace(' ', '')
+    option = option.strip()
+
+    archs = {
+        "CS_ARCH_ARM": CS_ARCH_ARM,
+        "CS_ARCH_ARM64": CS_ARCH_ARM64,
+        "CS_ARCH_MIPS": CS_ARCH_MIPS,
+        "CS_ARCH_PPC": CS_ARCH_PPC,
+        "CS_ARCH_SPARC": CS_ARCH_SPARC,
+        "CS_ARCH_SYSZ": CS_ARCH_SYSZ,
+        "CS_ARCH_X86": CS_ARCH_X86,
+        "CS_ARCH_XCORE": CS_ARCH_XCORE,
+        "CS_ARCH_M68K": CS_ARCH_M68K,
+    }
+    
+    modes = {
+        "CS_MODE_16": CS_MODE_16,
+        "CS_MODE_32": CS_MODE_32,
+        "CS_MODE_64": CS_MODE_64,
+        "CS_MODE_MIPS32": CS_MODE_MIPS32,
+        "CS_MODE_MIPS64": CS_MODE_MIPS64,
+        "0": CS_MODE_ARM,
+        "CS_MODE_ARM": CS_MODE_ARM,
+        "CS_MODE_THUMB": CS_MODE_THUMB,
+        "CS_MODE_ARM+CS_MODE_V8": CS_MODE_ARM+CS_MODE_V8,
+        "CS_MODE_THUMB+CS_MODE_V8": CS_MODE_THUMB+CS_MODE_V8,
+        "CS_MODE_THUMB+CS_MODE_MCLASS": CS_MODE_THUMB+CS_MODE_MCLASS,
+        "CS_MODE_LITTLE_ENDIAN": CS_MODE_LITTLE_ENDIAN,
+        "CS_MODE_BIG_ENDIAN": CS_MODE_BIG_ENDIAN,
+        "CS_MODE_64+CS_MODE_LITTLE_ENDIAN": CS_MODE_64+CS_MODE_LITTLE_ENDIAN,
+        "CS_MODE_64+CS_MODE_BIG_ENDIAN": CS_MODE_64+CS_MODE_BIG_ENDIAN,
+        "CS_MODE_MIPS32+CS_MODE_MICRO": CS_MODE_MIPS32+CS_MODE_MICRO,
+        "CS_MODE_MIPS32+CS_MODE_MICRO+CS_MODE_BIG_ENDIAN": CS_MODE_MIPS32+CS_MODE_MICRO+CS_MODE_BIG_ENDIAN,
+        "CS_MODE_MIPS32+CS_MODE_BIG_ENDIAN+CS_MODE_MICRO": CS_MODE_MIPS32+CS_MODE_MICRO+CS_MODE_BIG_ENDIAN,
+        "CS_MODE_BIG_ENDIAN+CS_MODE_V9": CS_MODE_BIG_ENDIAN + CS_MODE_V9,
+        "CS_MODE_MIPS32+CS_MODE_BIG_ENDIAN": CS_MODE_MIPS32+CS_MODE_BIG_ENDIAN,
+        "CS_MODE_MIPS32+CS_MODE_LITTLE_ENDIAN": CS_MODE_MIPS32+CS_MODE_LITTLE_ENDIAN,
+        "CS_MODE_MIPS64+CS_MODE_LITTLE_ENDIAN": CS_MODE_MIPS64+CS_MODE_LITTLE_ENDIAN,
+        "CS_MODE_MIPS64+CS_MODE_BIG_ENDIAN": CS_MODE_MIPS64+CS_MODE_BIG_ENDIAN,
+    }
+    
+    options = {
+        "CS_OPT_SYNTAX_ATT": CS_OPT_SYNTAX_ATT,
+        "CS_OPT_SYNTAX_NOREGNAME": CS_OPT_SYNTAX_NOREGNAME,
+    }
+
+    mc_modes = {
+        ("CS_ARCH_X86", "CS_MODE_32"): ['-triple=i386'],
+        ("CS_ARCH_X86", "CS_MODE_64"): ['-triple=x86_64'],
+        ("CS_ARCH_ARM", "CS_MODE_ARM"): ['-triple=armv7'],
+        ("CS_ARCH_ARM", "CS_MODE_THUMB"): ['-triple=thumbv7'],
+        ("CS_ARCH_ARM", "CS_MODE_ARM+CS_MODE_V8"): ['-triple=armv8'],
+        ("CS_ARCH_ARM", "CS_MODE_THUMB+CS_MODE_V8"): ['-triple=thumbv8'],
+        ("CS_ARCH_ARM", "CS_MODE_THUMB+CS_MODE_MCLASS"): ['-triple=thumbv7m'],
+        ("CS_ARCH_ARM64", "0"): ['-triple=aarch64'],
+        ("CS_ARCH_MIPS", "CS_MODE_MIPS32+CS_MODE_BIG_ENDIAN"): ['-triple=mips'],
+        ("CS_ARCH_MIPS", "CS_MODE_MIPS32+CS_MODE_MICRO"): ['-triple=mipsel', '-mattr=+micromips'],
+        ("CS_ARCH_MIPS", "CS_MODE_MIPS64"): ['-triple=mips64el'],
+        ("CS_ARCH_MIPS", "CS_MODE_MIPS32"): ['-triple=mipsel'],
+        ("CS_ARCH_MIPS", "CS_MODE_MIPS64+CS_MODE_BIG_ENDIAN"): ['-triple=mips64'],
+        ("CS_ARCH_MIPS", "CS_MODE_MIPS32+CS_MODE_MICRO+CS_MODE_BIG_ENDIAN"): ['-triple=mips', '-mattr=+micromips'],
+        ("CS_ARCH_MIPS", "CS_MODE_MIPS32+CS_MODE_BIG_ENDIAN+CS_MODE_MICRO"): ['-triple=mips', '-mattr=+micromips'],
+        ("CS_ARCH_PPC", "CS_MODE_BIG_ENDIAN"): ['-triple=powerpc64'],
+        ('CS_ARCH_SPARC', 'CS_MODE_BIG_ENDIAN'): ['-triple=sparc'],
+        ('CS_ARCH_SPARC', 'CS_MODE_BIG_ENDIAN+CS_MODE_V9'): ['-triple=sparcv9'],
+        ('CS_ARCH_SYSZ', '0'): ['-triple=s390x', '-mcpu=z196'],
+    }
+
+    #if not option in ('', 'None'):
+    #    print archs[arch], modes[mode], options[option]
+    
+    #print(arch, mode, option)
+    md = Cs(archs[arch], modes[mode])
+
+    if arch == 'CS_ARCH_ARM' or arch == 'CS_ARCH_PPC' :
+        md.syntax = CS_OPT_SYNTAX_NOREGNAME
+
+    if fname.endswith('3DNow.s.cs'):
+        md.syntax = CS_OPT_SYNTAX_ATT
+
+    for line in lines[1:]:
+        # ignore all the input lines having # in front.
+        if line.startswith('#'):
+            continue
+        #print("Check %s" %line)
+        code = line.split(' = ')[0]
+        asm  = ''.join(line.split(' = ')[1:])
+        hex_code = code.replace('0x', '')
+        hex_code = hex_code.replace(',', '')
+        hex_data = hex_code.decode('hex')
+        #hex_bytes = array.array('B', hex_data)
+
+        x = list(md.disasm(hex_data, 0))
+        if len(x) > 0:
+            if x[0].op_str != '':
+                cs_output = "%s %s" %(x[0].mnemonic, x[0].op_str)
+            else:
+                cs_output = x[0].mnemonic
+        else:
+            cs_output = 'FAILED to disassemble'
+
+        cs_output2 = normalize_hex(cs_output)
+        cs_output2 = cs_output2.replace(' ', '')
+
+        if arch == 'CS_ARCH_MIPS':
+            # normalize register alias names
+            cs_output2 = cs_output2.replace('$at', '$1')
+            cs_output2 = cs_output2.replace('$v0', '$2')
+            cs_output2 = cs_output2.replace('$v1', '$3')
+
+            cs_output2 = cs_output2.replace('$a0', '$4')
+            cs_output2 = cs_output2.replace('$a1', '$5')
+            cs_output2 = cs_output2.replace('$a2', '$6')
+            cs_output2 = cs_output2.replace('$a3', '$7')
+
+            cs_output2 = cs_output2.replace('$t0', '$8')
+            cs_output2 = cs_output2.replace('$t1', '$9')
+            cs_output2 = cs_output2.replace('$t2', '$10')
+            cs_output2 = cs_output2.replace('$t3', '$11')
+            cs_output2 = cs_output2.replace('$t4', '$12')
+            cs_output2 = cs_output2.replace('$t5', '$13')
+            cs_output2 = cs_output2.replace('$t6', '$14')
+            cs_output2 = cs_output2.replace('$t7', '$15')
+            cs_output2 = cs_output2.replace('$t8', '$24')
+            cs_output2 = cs_output2.replace('$t9', '$25')
+
+            cs_output2 = cs_output2.replace('$s0', '$16')
+            cs_output2 = cs_output2.replace('$s1', '$17')
+            cs_output2 = cs_output2.replace('$s2', '$18')
+            cs_output2 = cs_output2.replace('$s3', '$19')
+            cs_output2 = cs_output2.replace('$s4', '$20')
+            cs_output2 = cs_output2.replace('$s5', '$21')
+            cs_output2 = cs_output2.replace('$s6', '$22')
+            cs_output2 = cs_output2.replace('$s7', '$23')
+
+            cs_output2 = cs_output2.replace('$k0', '$26')
+            cs_output2 = cs_output2.replace('$k1', '$27')
+
+        print("\t%s = %s" %(hex_code, cs_output))
+
+
+if __name__ == '__main__':
+    if len(sys.argv) == 1:
+        fnames = sys.stdin.readlines()
+        for fname in fnames:
+            test_file(fname.strip())
+    else:
+        #print("Usage: ./test_mc.py <input-file.s.cs>")
+        test_file(sys.argv[1])
+
diff --git a/suite/disasm_mc.sh b/suite/disasm_mc.sh
new file mode 100755
index 00000000..8de5a152
--- /dev/null
+++ b/suite/disasm_mc.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# This script test all architectures by default.
+
+find MC/ -name *.cs | ./disasm_mc.py
+
+# To test just one architecture, specify the corresponsing dir:
+# $ find MC/X86 -name *.cs | ./disasm_mc.py
+
+# To test just one input file, run disasm_mc.py with that file:
+# $ ./disasm_mc.py MC/X86/x86-32-fma3.s.cs