diff --git a/skeletons/tests/check-INTEGER.c b/skeletons/tests/check-INTEGER.c
index 17fa099..0b2fbf6 100644
--- a/skeletons/tests/check-INTEGER.c
+++ b/skeletons/tests/check-INTEGER.c
@@ -44,6 +44,7 @@
 	printf(" (%ld, %d) vs (%ld, %d)\n",
 		rlong, ret, check_long, check_ret);
 	assert(ret == check_ret);
+	printf("%ld %ld\n", rlong, check_long);
 	assert(rlong == check_long);
 
 	if(check_ret == 0) {
@@ -134,7 +135,7 @@
 	CHECK(buf8, 0x7F7E7D7C, 0);
 	CHECK(buf9, 0x7F7E7D7C, 0);
 	CHECK(buf10, 0x7F7E7D7C, 0);
-	CHECK(buf11, 0x80000000, 0);
+	CHECK(buf11, -2147483648, 0);	/* 0x80000000 */
 	CHECK(buf12, -32768, 0);
 	CHECK(buf13, -128, 0);
 
diff --git a/skeletons/tests/check-OCTET_STRING.c b/skeletons/tests/check-OCTET_STRING.c
index dd5d049..96c224a 100644
--- a/skeletons/tests/check-OCTET_STRING.c
+++ b/skeletons/tests/check-OCTET_STRING.c
@@ -89,6 +89,7 @@
 	check(UTF8, "z", "<z z z>a&#32;b</z z z>", "a b");
 	check(UTF8, "z", "<z>a&#32323;b</z>", "a\347\271\203b");
 	check(UTF8, "z", "<z>a&#3000000000;b</z>", "a&#3000000000;b");
+	check(UTF8, "z", "<z>a&#5000000000;b</z>", "a&#5000000000;b");
 	check(UTF8, "z", "<z>a&#300</z>", "a&#300");
 	check(UTF8, "z", "<z>a&#-300;</z>", "a&#-300;");
 	check(UTF8, "z", "<z>a<ff/>b</z>", "a\014b");
diff --git a/skeletons/tests/check-length.c b/skeletons/tests/check-length.c
index 3f5c0fe..9a6d8d6 100644
--- a/skeletons/tests/check-length.c
+++ b/skeletons/tests/check-length.c
@@ -87,6 +87,7 @@
 	uint8_t buf1[] = { 0x85, 0x00, 0x01, 0x02, 0x03, 0x04 };
 	uint8_t buf2[] = { 0x85, 0x00, 0x7f, 0xff, 0x03, 0x04 };
 	uint8_t buf3[] = { 0x85, 0x00, 0x7f, 0xff, 0xff, 0x04 };
+	uint8_t buf4[] = { 0x89, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04 };
 	ber_tlv_len_t tlv_len;
 	ssize_t ret;
 	int i;
@@ -104,9 +105,15 @@
 	printf("ret=%ld, len=%ld\n", (long)ret, (long)tlv_len);
 	assert(ret == sizeof(buf2));
 
-	ret = ber_fetch_length(0, buf3, sizeof(buf3), &tlv_len);
-	printf("ret=%ld\n", (long)ret);
-	assert(ret == -1);
+	if(sizeof(tlv_len) == 4) {
+		ret = ber_fetch_length(0, buf3, sizeof(buf3), &tlv_len);
+		printf("ret=%ld\n", (long)ret);
+		assert(ret == -1);
+	} else if(sizeof(tlv_len) == 8) {
+		ret = ber_fetch_length(0, buf4, sizeof(buf4), &tlv_len);
+		printf("ret=%ld\n", (long)ret);
+		assert(ret == -1);
+	}
 
 	return 0;
 }