diff --git a/test/tap/tests/Makefile b/test/tap/tests/Makefile
index 6dbd1b797..d0cd464ad 100644
--- a/test/tap/tests/Makefile
+++ b/test/tap/tests/Makefile
@@ -6,18 +6,20 @@ all: tests
 
 .PHONY: clean
 clean:
-	rm basic-t set_character_set-t
+	rm basic-t set_character_set-t charset_unsigned_int-t
 
 OPT=-O2
 
-SRC=basic-t.cpp set_character_set-t.cpp
+SRC=basic-t.cpp set_character_set-t.cpp charset_unsigned_int-t.cpp
 
-tests: basic-t set_character_set-t
+tests: basic-t set_character_set-t charset_unsigned_int-t
 
 basic-t: $(LIBDIR)/libtap.a
 	g++ basic-t.cpp -I$(INCLUDEDIR) -L$(LIBDIR) -std=c++11 -ltap -o basic-t
 
-set_character_set-t: set_character_set-t.cpp set_character_set-t.cpp $(LIBDIR)/libtap.a
+set_character_set-t: set_character_set-t.cpp $(LIBDIR)/libtap.a
 	g++ set_character_set-t.cpp -I$(INCLUDEDIR) -L$(LIBDIR) -std=c++11 `mysql_config --include --libs` -lmysqlclient -ltap -o set_character_set-t
 
+charset_unsigned_int-t: charset_unsigned_int-t.cpp $(LIBDIR)/libtap.a
+	g++ charset_unsigned_int-t.cpp -I$(INCLUDEDIR) -L$(LIBDIR) -std=c++11 `mysql_config --include --libs` -lmysqlclient -ltap -o charset_unsigned_int-t
 
diff --git a/test/tap/tests/charset_unsigned_int-t.cpp b/test/tap/tests/charset_unsigned_int-t.cpp
new file mode 100644
index 000000000..456e36244
--- /dev/null
+++ b/test/tap/tests/charset_unsigned_int-t.cpp
@@ -0,0 +1,164 @@
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <unistd.h>
+
+#include <string>
+#include <mysql.h>
+
+#include "tap.h"
+#include "command_line.h"
+
+int show_variable(MYSQL *mysql, const std::string& var_name, std::string& var_value) {
+	char query[128];
+
+	snprintf(query, sizeof(query),"show variables like '%s'", var_name.c_str());
+	if (mysql_query(mysql, query)) {
+		fprintf(stderr, "Failed to execute SHOW VARIABLES LIKE : no %d, %s\n",
+				mysql_errno(mysql), mysql_error(mysql));
+		return -1;
+	}
+
+	MYSQL_RES *result;
+	MYSQL_ROW row;
+	result = mysql_store_result(mysql);
+
+	int num_fields = mysql_num_fields(result);
+
+	row = mysql_fetch_row(result);
+	var_value = row[1];
+	mysql_free_result(result);
+}
+
+int show_admin_global_variable(MYSQL *mysql, const std::string& var_name, std::string& var_value) {
+	char query[128];
+
+	snprintf(query, sizeof(query),"select variable_value from global_variables where variable_name='%s'", var_name.c_str());
+	if (mysql_query(mysql, query)) {
+		fprintf(stderr, "Failed to execute SHOW VARIABLES LIKE : no %d, %s\n",
+				mysql_errno(mysql), mysql_error(mysql));
+		return -1;
+	}
+
+	MYSQL_RES *result;
+	MYSQL_ROW row;
+	result = mysql_store_result(mysql);
+
+	int num_fields = mysql_num_fields(result);
+
+	row = mysql_fetch_row(result);
+	var_value = row[0];
+	mysql_free_result(result);
+}
+
+int get_server_version(MYSQL *mysql, std::string& version) {
+	char query[128];
+
+	if (mysql_query(mysql, "select @@version")) {
+		fprintf(stderr, "Error %d, %s\n",
+				mysql_errno(mysql), mysql_error(mysql));
+		return -1;
+	}
+
+	MYSQL_RES *result;
+	MYSQL_ROW row;
+	result = mysql_store_result(mysql);
+
+	int num_fields = mysql_num_fields(result);
+
+	row = mysql_fetch_row(result);
+	version = row[0];
+	mysql_free_result(result);
+
+	return 0;
+}
+
+int main(int argc, char** argv) {
+	CommandLine cl;
+
+	if(cl.parse(argc, argv))
+		return exit_status();
+
+	plan(6);
+	diag("Testing correct collation set with proxysql");
+
+	std::string var_collation_connection = "collation_connection";
+	std::string var_value;
+
+	/* Check that set names can set collation > 255 */
+	MYSQL* mysql = mysql_init(NULL);
+	if (!mysql) return exit_status();
+	if (!mysql_real_connect(mysql, cl.host, cl.username, cl.password, NULL, cl.port, NULL, 0)) return exit_status();
+
+	if (mysql_query(mysql, "set names 'utf8'")) return exit_status();
+	show_variable(mysql, var_collation_connection, var_value);
+	ok(var_value.compare("utf8_general_ci") == 0, "Initial client character set");
+
+	if (mysql_query(mysql, "set names utf8mb4 collate utf8mb4_croatian_ci")) return exit_status();
+	show_variable(mysql, var_collation_connection, var_value);
+	ok(var_value.compare("utf8mb4_croatian_ci") == 0, "Collation >255 is set");
+
+	mysql_close(mysql);
+
+	/* Check that default collation can be configures through admin */
+	std::string var_name="mysql-default_charset";
+	MYSQL * mysql_a = mysql_init(NULL);
+	if (!mysql) return exit_status();
+	if (!mysql_real_connect(mysql_a, cl.host, "admin", "admin", NULL, 6032, NULL, 0)) return exit_status();
+
+	if (mysql_query(mysql_a, "update global_variables set variable_value='latin1' where variable_name='mysql-default_charset'")) return exit_status();
+	if (mysql_query(mysql_a, "load mysql variables to runtime")) return exit_status();
+	if (mysql_query(mysql_a, "save mysql variables to disk")) return exit_status();
+
+	show_admin_global_variable(mysql_a, var_name, var_value);
+	ok(var_value.compare("latin1") == 0, "Default charset latin1 is set in admin");
+
+	if (mysql_query(mysql_a, "update global_variables set variable_value='utf8mb4' where variable_name='mysql-default_charset'")) return exit_status();
+	if (mysql_query(mysql_a, "load mysql variables to runtime")) return exit_status();
+	if (mysql_query(mysql_a, "save mysql variables to disk")) return exit_status();
+
+	show_admin_global_variable(mysql_a, var_name, var_value);
+	ok(var_value.compare("utf8mb4") == 0, "Default charset utf8mb4 is set in admin");
+
+	mysql_close(mysql_a);
+
+	MYSQL* mysql_b = mysql_init(NULL);
+	if (!mysql_b) return exit_status();
+	if (!mysql_real_connect(mysql_b, cl.host, cl.username, cl.password, NULL, cl.port, NULL, 0)) return exit_status();
+
+	std::string version;
+	get_server_version(mysql_b, version);
+	if (version[0] == '5') {
+		show_variable(mysql_b, var_collation_connection, var_value);
+		ok(var_value.compare("utf8mb4_general_ci") == 0, "Collation 255 is set, because proxyserver changed it");
+	}
+	else {
+		show_variable(mysql_b, var_collation_connection, var_value);
+		ok(var_value.compare("utf8mb4_0900_ai_ci") == 0, "Collation >255 is set");
+	}
+
+	mysql_close(mysql_b);
+
+
+	/* check initial options */
+	MYSQL * mysql_c = mysql_init(NULL);
+	if (!mysql_c) return exit_status();
+	if (mysql_options(mysql_c, MYSQL_SET_CHARSET_NAME, "utf8mb4")) return exit_status();
+	if (!mysql_real_connect(mysql_c, cl.host, cl.username, cl.password, NULL, cl.port, NULL, 0)) return exit_status();
+
+	if (get_server_version(mysql_c, version)) return exit_status();
+	if (version[0] == '5') {
+		show_variable(mysql_c, var_collation_connection, var_value);
+		ok(var_value.compare("utf8mb4_general_ci") == 0, "Collation 255 is set, because proxyserver changed it");
+	}
+	else {
+		show_variable(mysql_c, var_collation_connection, var_value);
+		ok(var_value.compare("utf8mb4_0900_ai_ci") == 0, "Collation >255 is set");
+	}
+
+	mysql_close(mysql_c);
+
+
+	return exit_status();
+}
+