diff --git a/unit/stk-test-data.h b/unit/stk-test-data.h
index 68810f88..5e447c92 100644
--- a/unit/stk-test-data.h
+++ b/unit/stk-test-data.h
@@ -863,3 +863,38 @@ static const unsigned char get_input_521[] = {
 };
 
 #define get_input_response_521 get_input_response_181
+
+static const unsigned char get_input_611[] = {
+	0xD0, 0x1D, 0x81, 0x03, 0x01, 0x23, 0x00, 0x82, 0x02, 0x81, 0x82,0x8D,
+	0x0A, 0x04, 0x3C, 0x4E, 0x4F, 0x2D, 0x49, 0x43, 0x4F, 0x4E, 0x3E, 0x91,
+	0x02, 0x00, 0x0A, 0x1E, 0x02, 0x00, 0x01
+};
+
+static const unsigned char get_input_response_611a[] = {
+	0x81, 0x03, 0x01, 0x23, 0x00, 0x82, 0x02, 0x82, 0x81, 0x83, 0x01, 0x00,
+	0x8d, 0x02, 0x04, 0x2b,
+};
+
+static const unsigned char get_input_621[] = {
+	0xD0, 0x20, 0x81, 0x03, 0x01, 0x23, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+	0x0D, 0x04, 0x3C, 0x42, 0x41, 0x53, 0x49, 0x43, 0x2D, 0x49, 0x43, 0x4F,
+	0x4E, 0x3E, 0x91, 0x02, 0x00, 0x0A, 0x1E, 0x02, 0x01, 0x01
+};
+
+#define get_input_response_621a get_input_response_611a
+
+static const unsigned char get_input_631[] = {
+	0xD0, 0x1D, 0x81, 0x03, 0x01, 0x23, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+	0x0A, 0x04, 0x3C, 0x4E, 0x4F, 0x2D, 0x49, 0x43, 0x4F, 0x4E, 0x3E, 0x91,
+	0x02, 0x00, 0x0A, 0x1E, 0x02, 0x00, 0x02
+};
+
+#define get_input_response_631a get_input_response_611a
+
+static const unsigned char get_input_641[] = {
+	0xD0, 0x21, 0x81, 0x03, 0x01, 0x23, 0x00, 0x82, 0x02, 0x81, 0x82, 0x8D,
+	0x0E, 0x04, 0x3C, 0x43, 0x4F, 0x4C, 0x4F, 0x55, 0x52, 0x2D, 0x49, 0x43,
+	0x4F, 0x4E, 0x3E, 0x91, 0x02, 0x00, 0x0A, 0x1E, 0x02, 0x01, 0x02
+};
+
+#define get_input_response_641a get_input_response_611a
diff --git a/unit/test-stkutil.c b/unit/test-stkutil.c
index 61b20752..dc0b7f03 100644
--- a/unit/test-stkutil.c
+++ b/unit/test-stkutil.c
@@ -1553,36 +1553,6 @@ struct get_input_test {
 	char *html;
 };
 
-static unsigned char get_input_611[] = { 0xD0, 0x1D, 0x81, 0x03, 0x01, 0x23,
-						0x00, 0x82, 0x02, 0x81, 0x82,
-						0x8D, 0x0A, 0x04, 0x3C, 0x4E,
-						0x4F, 0x2D, 0x49, 0x43, 0x4F,
-						0x4E, 0x3E, 0x91, 0x02, 0x00,
-						0x0A, 0x1E, 0x02, 0x00, 0x01 };
-
-static unsigned char get_input_621[] = { 0xD0, 0x20, 0x81, 0x03, 0x01, 0x23,
-						0x00, 0x82, 0x02, 0x81, 0x82,
-						0x8D, 0x0D, 0x04, 0x3C, 0x42,
-						0x41, 0x53, 0x49, 0x43, 0x2D,
-						0x49, 0x43, 0x4F, 0x4E, 0x3E,
-						0x91, 0x02, 0x00, 0x0A, 0x1E,
-						0x02, 0x01, 0x01 };
-
-static unsigned char get_input_631[] = { 0xD0, 0x1D, 0x81, 0x03, 0x01, 0x23,
-						0x00, 0x82, 0x02, 0x81, 0x82,
-						0x8D, 0x0A, 0x04, 0x3C, 0x4E,
-						0x4F, 0x2D, 0x49, 0x43, 0x4F,
-						0x4E, 0x3E, 0x91, 0x02, 0x00,
-						0x0A, 0x1E, 0x02, 0x00, 0x02 };
-
-static unsigned char get_input_641[] = { 0xD0, 0x21, 0x81, 0x03, 0x01, 0x23,
-						0x00, 0x82, 0x02, 0x81, 0x82,
-						0x8D, 0x0E, 0x04, 0x3C, 0x43,
-						0x4F, 0x4C, 0x4F, 0x55, 0x52,
-						0x2D, 0x49, 0x43, 0x4F, 0x4E,
-						0x3E, 0x91, 0x02, 0x00, 0x0A,
-						0x1E, 0x02, 0x01, 0x02 };
-
 static unsigned char get_input_711[] = { 0xD0, 0x1B, 0x81, 0x03, 0x01, 0x23,
 						0x80, 0x82, 0x02, 0x81, 0x82,
 						0x8D, 0x0C, 0x04, 0x45, 0x6E,
@@ -17673,11 +17643,6 @@ static const struct terminal_response_test get_input_response_data_421 = {
 	},
 };
 
-static const unsigned char get_input_response_611a[] = {
-	0x81, 0x03, 0x01, 0x23, 0x00, 0x82, 0x02, 0x82,
-	0x81, 0x83, 0x01, 0x00, 0x8d, 0x02, 0x04, 0x2b,
-};
-
 static const struct terminal_response_test get_input_response_data_611a = {
 	.pdu = get_input_response_611a,
 	.pdu_len = sizeof(get_input_response_611a),