diff --git a/unit/stk-test-data.h b/unit/stk-test-data.h
index 1e316f56..85cf4557 100644
--- a/unit/stk-test-data.h
+++ b/unit/stk-test-data.h
@@ -433,3 +433,35 @@ static const unsigned char get_inkey_response_512[] = {
 	0x81, 0x03, 0x01, 0x22, 0x04, 0x82, 0x02, 0x82, 0x81, 0x83, 0x01, 0x00,
 	0x8d, 0x02, 0x04, 0x00,
 };
+
+static const unsigned char get_inkey_611[] = {
+	0xD0, 0x19, 0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+	0x0A, 0x04, 0x3C, 0x4E, 0x4F, 0x2D, 0x49, 0x43, 0x4F, 0x4E, 0x3E, 0x1E,
+	0x02, 0x00, 0x01
+};
+
+#define get_inkey_response_611 get_inkey_response_111
+
+static const unsigned char get_inkey_621[] = {
+	0xD0, 0x1C, 0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+	0x0D, 0x04, 0x3C, 0x42, 0x41, 0x53, 0x49, 0x43, 0x2D, 0x49, 0x43, 0x4F,
+	0x4E, 0x3E, 0x1E, 0x02, 0x01, 0x01
+};
+
+#define get_inkey_response_621 get_inkey_response_111
+
+static const unsigned char get_inkey_631[] = {
+	0xD0, 0x19, 0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+	0x0A, 0x04, 0x3C, 0x4E, 0x4F, 0x2D, 0x49, 0x43, 0x4F, 0x4E, 0x3E, 0x1E,
+	0x02, 0x00, 0x02
+};
+
+#define get_inkey_response_631 get_inkey_response_111
+
+static const unsigned char get_inkey_641[] = {
+	0xD0, 0x1D, 0x81, 0x03, 0x01, 0x22, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+	0x0E, 0x04, 0x3C, 0x43, 0x4F, 0x4C, 0x4F, 0x55, 0x52, 0x2D, 0x49, 0x43,
+	0x4F, 0x4E, 0x3E, 0x1E, 0x02, 0x01, 0x02
+};
+
+#define get_inkey_response_641 get_inkey_response_111
diff --git a/unit/test-stkutil.c b/unit/test-stkutil.c
index 9d9afa11..ed768d79 100644
--- a/unit/test-stkutil.c
+++ b/unit/test-stkutil.c
@@ -891,34 +891,6 @@ struct get_inkey_test {
 	char *html;
 };
 
-static unsigned char get_inkey_611[] = { 0xD0, 0x19, 0x81, 0x03, 0x01, 0x22,
-						0x00, 0x82, 0x02, 0x81, 0x82,
-						0x8D, 0x0A, 0x04, 0x3C, 0x4E,
-						0x4F, 0x2D, 0x49, 0x43, 0x4F,
-						0x4E, 0x3E, 0x1E, 0x02, 0x00,
-						0x01 };
-
-static unsigned char get_inkey_621[] = { 0xD0, 0x1C, 0x81, 0x03, 0x01, 0x22,
-						0x00, 0x82, 0x02, 0x81, 0x82,
-						0x8D, 0x0D, 0x04, 0x3C, 0x42,
-						0x41, 0x53, 0x49, 0x43, 0x2D,
-						0x49, 0x43, 0x4F, 0x4E, 0x3E,
-						0x1E, 0x02, 0x01, 0x01 };
-
-static unsigned char get_inkey_631[] = { 0xD0, 0x19, 0x81, 0x03, 0x01, 0x22,
-						0x00, 0x82, 0x02, 0x81, 0x82,
-						0x8D, 0x0A, 0x04, 0x3C, 0x4E,
-						0x4F, 0x2D, 0x49, 0x43, 0x4F,
-						0x4E, 0x3E, 0x1E, 0x02, 0x00,
-						0x02 };
-
-static unsigned char get_inkey_641[] = { 0xD0, 0x1D, 0x81, 0x03, 0x01, 0x22,
-						0x00, 0x82, 0x02, 0x81, 0x82,
-						0x8D, 0x0E, 0x04, 0x3C, 0x43,
-						0x4F, 0x4C, 0x4F, 0x55, 0x52,
-						0x2D, 0x49, 0x43, 0x4F, 0x4E,
-						0x3E, 0x1E, 0x02, 0x01, 0x02 };
-
 static unsigned char get_inkey_711[] = { 0xD0, 0x15, 0x81, 0x03, 0x01, 0x22,
 						0x80, 0x82, 0x02, 0x81, 0x82,
 						0x8D, 0x0A, 0x04, 0x45, 0x6E,