diff --git a/suite/cstest/src/arm64_detail.c b/suite/cstest/src/arm64_detail.c
index 5f90441f..1617a7a8 100644
--- a/suite/cstest/src/arm64_detail.c
+++ b/suite/cstest/src/arm64_detail.c
@@ -87,8 +87,7 @@ char *get_detail_arm64(csh *handle, cs_mode mode, cs_insn *ins)
 				break;
 		}
 
-		if (op->shift.type != ARM64_SFT_INVALID &&
-				op->shift.value)
+		if (op->shift.type != ARM64_SFT_INVALID && op->shift.value)
 			add_str(&result, " ; Shift: type = %u, value = %u", op->shift.type, op->shift.value);
 
 		if (op->ext != ARM64_EXT_INVALID)
@@ -132,4 +131,3 @@ char *get_detail_arm64(csh *handle, cs_mode mode, cs_insn *ins)
 
 	return result;
 }
-
diff --git a/suite/cstest/src/arm_detail.c b/suite/cstest/src/arm_detail.c
index 26f4b087..a2b48ff9 100644
--- a/suite/cstest/src/arm_detail.c
+++ b/suite/cstest/src/arm_detail.c
@@ -147,4 +147,3 @@ char *get_detail_arm(csh *handle, cs_mode mode, cs_insn *ins)
 
 	return result;
 }
-
diff --git a/suite/cstest/src/capstone_test.c b/suite/cstest/src/capstone_test.c
index e823e237..33bf1693 100644
--- a/suite/cstest/src/capstone_test.c
+++ b/suite/cstest/src/capstone_test.c
@@ -84,7 +84,7 @@ double_dict options[] = {
 
 char *(*function)(csh *, cs_mode, cs_insn*) = NULL;
 
-int triple_compare(const char *src1, const char *src2, const char *des)
+static int triple_compare(const char *src1, const char *src2, const char *des)
 {
 	if (strcmp(src1, des) && strcmp(src2, des)) {
 		fprintf(stderr,"[  ERROR   ] --- \"%s\" != \"%s\"", src1, des);
@@ -248,6 +248,7 @@ void test_single_issue(csh *handle, cs_mode mode, char *line, int detail)
 	cs_result[0] = '\0';
 
 	list_part = split(line, " == ", &size_part);
+
 	offset_opcode = split(list_part[0], ": ", &size_offset_opcode);
 	if (size_offset_opcode > 1) {
 		offset = (unsigned int)strtol(offset_opcode[0], NULL, 16);
@@ -256,6 +257,7 @@ void test_single_issue(csh *handle, cs_mode mode, char *line, int detail)
 		offset = 0;
 		list_byte = split(offset_opcode[0], ",", &size_byte);
 	}
+
 	code = (unsigned char *)malloc(sizeof(char) * size_byte);
 	for (i=0; i<size_byte; ++i) {
 		code[i] = (unsigned char)strtol(list_byte[i], NULL, 16);
@@ -298,6 +300,7 @@ void test_single_issue(csh *handle, cs_mode mode, char *line, int detail)
 		fprintf(stderr, "[  ERROR   ] --- Number of details doesn't match\n");
 		_fail(__FILE__, __LINE__);
 	}
+
 	for (i=0; i<size_part_cs_result; ++i) {
 		trim_str(&list_part_cs_result[i]);
 		trim_str(&list_part_issue_result[i]);
diff --git a/suite/cstest/src/helper.c b/suite/cstest/src/helper.c
index d6798144..631a9943 100644
--- a/suite/cstest/src/helper.c
+++ b/suite/cstest/src/helper.c
@@ -9,6 +9,7 @@ char **split(char *str, char *delim, int *size)
 	cnt = 0;
 	src = str;
 	result = NULL;
+
 	while ((token = strstr(src, delim)) != NULL) {
 		result = (char **)realloc(result, sizeof(char *) * (cnt + 1));
 		result[cnt] = (char *)calloc(1, sizeof(char) * (int)(token - src + 10));
@@ -23,7 +24,9 @@ char **split(char *str, char *delim, int *size)
 		result[cnt] = strdup(src);
 		cnt ++;
 	}
+
 	*size = cnt;
+
 	return result;
 }
 
@@ -51,6 +54,7 @@ const char *get_filename_ext(const char *filename)
 	dot = strrchr(filename, '.');
 	if (!dot || dot == filename)
 		return "";
+
 	return dot + 1;
 }
 
@@ -75,6 +79,7 @@ char *readfile(const char *filename)
 	result[size] = '\0';
 
 	fclose(fp);
+
 	return result;
 }
 
@@ -107,6 +112,7 @@ void replace_hex(char **src)
 	result = (char *)malloc(sizeof(char));
 	result[0] = '\0';
 	tmp = *src;
+
 	while ( (found = strstr(tmp, "0x")) != NULL ) {
 		*found = '\0';
 		found += 2;
@@ -124,6 +130,7 @@ void replace_hex(char **src)
 		add_str(&result, "%s%llu", tmp, value);
 		tmp = found;
 	}
+
 	add_str(&result, "%s", tmp);
 	free(*src);
 	*src = result;
@@ -155,6 +162,7 @@ void listdir(const char *name, char ***files, int *num_files)
 			*num_files = cnt;
 		}
 	}
+
 	closedir(dir);
 }
 
diff --git a/suite/cstest/src/m680x_detail.c b/suite/cstest/src/m680x_detail.c
index e5c49e60..96be61ff 100644
--- a/suite/cstest/src/m680x_detail.c
+++ b/suite/cstest/src/m680x_detail.c
@@ -4,7 +4,7 @@ static const char *s_access[] = {
 	"UNCHANGED", "READ", "WRITE", "READ ; WRITE",
 };
 
-void print_read_write_regs(char *result, csh *handle, cs_detail *detail)
+static void print_read_write_regs(char *result, csh *handle, cs_detail *detail)
 {
 	int i;
 
@@ -130,7 +130,6 @@ char *get_detail_m680x(csh *handle, cs_mode mode, cs_insn *insn)
 	}
 
 	print_read_write_regs(result, handle, detail);
+
 	return result;
 }
-
-
diff --git a/suite/cstest/src/main.c b/suite/cstest/src/main.c
index b7e6e8ff..fdbc8298 100644
--- a/suite/cstest/src/main.c
+++ b/suite/cstest/src/main.c
@@ -136,7 +136,7 @@ static int teardown_issue(void **state)
 	return 0;
 }
 
-void test_file(const char *filename)
+static void test_file(const char *filename)
 {
 	int size, i;
 	char **list_str; 
@@ -187,7 +187,7 @@ void test_file(const char *filename)
 	free_strs(list_lines, size_lines);
 }
 
-void test_folder(const char *folder)
+static void test_folder(const char *folder)
 {
 	char **files;
 	int num_files, i;
diff --git a/suite/cstest/src/x86_detail.c b/suite/cstest/src/x86_detail.c
index 6972ff8b..892a3d89 100644
--- a/suite/cstest/src/x86_detail.c
+++ b/suite/cstest/src/x86_detail.c
@@ -1,6 +1,6 @@
 #include "factory.h"
 
-void print_string_hex(char **result, const char *comment, unsigned char *str, size_t len)
+static void print_string_hex(char **result, const char *comment, unsigned char *str, size_t len)
 {
 	unsigned char *c;