diff --git a/suite/cstest/include/factory.h b/suite/cstest/include/factory.h
index 0752ff0774..b18285ad11 100644
--- a/suite/cstest/include/factory.h
+++ b/suite/cstest/include/factory.h
@@ -26,5 +26,6 @@ char *get_detail_bpf(csh *handle, cs_mode mode, cs_insn *ins);
 char *get_detail_tricore(csh *handle, cs_mode mode, cs_insn *ins);
 char *get_detail_alpha(csh *handle, cs_mode mode, cs_insn *ins);
 char *get_detail_hppa(csh *handle, cs_mode mode, cs_insn *ins);
+char *get_detail_xtensa(csh *p_handle, cs_mode mode, cs_insn *ins);
 
 #endif /* FACTORY_H */
diff --git a/suite/cstest/src/capstone_test.c b/suite/cstest/src/capstone_test.c
index 1cb8ae5cf9..5533f79e17 100644
--- a/suite/cstest/src/capstone_test.c
+++ b/suite/cstest/src/capstone_test.c
@@ -201,6 +201,9 @@ int set_function(int arch)
 		case CS_ARCH_HPPA:
 			function = get_detail_hppa;
 			break;
+		case CS_ARCH_XTENSA:
+			function = get_detail_xtensa;
+			break;
 		default:
 			return -1;
 	}
diff --git a/suite/cstest/src/main.c b/suite/cstest/src/main.c
index 0a02449ec8..7cb1f2f654 100644
--- a/suite/cstest/src/main.c
+++ b/suite/cstest/src/main.c
@@ -23,6 +23,7 @@ static single_dict arches[] = {
 	{"CS_ARCH_TRICORE", CS_ARCH_TRICORE},
 	{"CS_ARCH_ALPHA", CS_ARCH_ALPHA},
 	{"CS_ARCH_HPPA", CS_ARCH_HPPA},
+	{"CS_ARCH_XTENSA", CS_ARCH_XTENSA},
 };
 
  static single_dict modes[] = {
diff --git a/suite/cstest/src/xtensa_detail.c b/suite/cstest/src/xtensa_detail.c
new file mode 100644
index 0000000000..b8c1488c9f
--- /dev/null
+++ b/suite/cstest/src/xtensa_detail.c
@@ -0,0 +1,7 @@
+#include "factory.h"
+
+char *get_detail_xtensa(csh *p_handle, cs_mode mode, cs_insn *ins)
+{
+	char *result = NULL;
+	return result;
+}
diff --git a/suite/fuzz/platform.c b/suite/fuzz/platform.c
index ea5f46723b..fd6b058681 100644
--- a/suite/fuzz/platform.c
+++ b/suite/fuzz/platform.c
@@ -379,7 +379,12 @@ struct platform platforms[] = {
 				"TRICORE",
 				"tc162"
 		},
-
+		{
+				CS_ARCH_XTENSA,
+				CS_MODE_LITTLE_ENDIAN,
+				"XTENSA",
+				"xtensa"
+		},
 		// dummy entry to mark the end of this array.
 		// DO NOT DELETE THIS
 		{