diff --git a/test/tap/install.sh b/test/tap/install.sh
index 779df5ae8..ef3174d73 100755
--- a/test/tap/install.sh
+++ b/test/tap/install.sh
@@ -159,107 +159,107 @@ if [[ ${NOTESTS} -eq 0 ]]; then
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "matching" ]]; then
       echo "============= matching ============="
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/matching.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/matching.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "eq" ]]; then
       echo "============= eq ============="
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/eq.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/eq.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "moretap" ]]; then
       echo "============= moretap ============="
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/moretap.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/moretap.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "todotap" ]]; then
       echo "============= todotap ============="
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/todotap.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/todotap.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "utils" ]]; then
       echo "============= utils ============="
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/utils.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/utils.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "charset" ]]; then
       echo "============= character sets ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-charset.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-charset.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "collation" ]]; then
       echo "============= collations ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-collation.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-collation.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "column" ]]; then
       echo "============= columns ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-column.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-column.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "constraint" ]]; then
       echo "============= constraints ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-constraint.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-constraint.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "engine" ]]; then
       echo "============= engines ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-engine.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-engine.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "event" ]]; then
       echo "============= events ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-event.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-event.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "index" ]]; then
       echo "============= indexes ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-index.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-index.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "partition" ]]; then
       echo "============= partitions ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-partition.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-partition.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "privilege" ]]; then
       echo "============= privileges ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-privilege.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-privilege.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "role" ]]; then
       echo "============= role ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-role.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-role.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "routines" ]]; then
       echo "============= routines ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-routines.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-routines.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "schemata" ]]; then
       echo "============= schemas ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-schemata.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-schemata.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "table" ]]; then
       echo "============= tables ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-table.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-table.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "trigger" ]]; then
       echo "============= triggers ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-trigger.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-trigger.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "user" ]]; then
       echo "============= users ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-user.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-user.my'
    fi
 
    if [[ ${FILTER} == 0 ]] || [[ ${FILTER} =~ "view" ]]; then
       echo "============= views ============"
-      mysql ${MYSQLOPTS} --database tap --execute 'source tests/test-mytap-view.my'
+      mysql ${MYSQLOPTS} --database tap --execute 'source t/test-mytap-view.my'
    fi
 
 fi
diff --git a/test/tap/run.sh b/test/tap/run.sh
index fb844742f..72a2484bc 100755
--- a/test/tap/run.sh
+++ b/test/tap/run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 TAP_HOST="${TAP_HOST:=127.0.0.1}"
-TAP_PORT="${TAP_PORT:=3306}"
+TAP_PORT="${TAP_PORT:=6033}"
 TAP_USERNAME="${TAP_USERNAME:=root}"
 TAP_PASSWORD="${TAP_PASSWORD:=a}"
 
diff --git a/test/tap/tests/charset_unsigned_int-t.cpp b/test/tap/tests/charset_unsigned_int-t.cpp
index 456e36244..7665d7988 100644
--- a/test/tap/tests/charset_unsigned_int-t.cpp
+++ b/test/tap/tests/charset_unsigned_int-t.cpp
@@ -96,7 +96,13 @@ int main(int argc, char** argv) {
 
 	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");
+	std::string version;
+	get_server_version(mysql, version);
+	if (version[0] == '5') {
+		ok(var_value.compare("utf8mb4_general_ci") == 0, "Backend is mysql version < 8.0. Collation is reduced to utf8mb4_general_ci as expected");
+	} else {
+		ok(var_value.compare("utf8mb4_croatian_ci") == 0, "Backend is mysql version >= 8.0. Collation is set as expected to utf8mb4_croatian_ci");
+	}
 
 	mysql_close(mysql);
 
@@ -126,7 +132,6 @@ int main(int argc, char** argv) {
 	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);