diff --git a/tests/tests-c-compiler/check-src/check-119.-fwide-types.-gen-PER.c b/tests/tests-c-compiler/check-src/check-119.-fwide-types.-gen-PER.c
index f0edbb4..31270c3 100644
--- a/tests/tests-c-compiler/check-src/check-119.-fwide-types.-gen-PER.c
+++ b/tests/tests-c-compiler/check-src/check-119.-fwide-types.-gen-PER.c
@@ -189,8 +189,7 @@
 					fbuf_left, fbuf_offset, size);
 				assert(fbuf_offset == (ssize_t)size);
 			} else {
-				assert(fbuf_offset - size < 2
-				|| (fbuf_offset + 1 /* "\n" */  == (ssize_t)size
+				assert((fbuf_offset + 1 /* "\n" */  == (ssize_t)size
 					&& fbuf[size - 1] == '\n')
 				|| (fbuf_offset + 2 /* "\r\n" */  == (ssize_t)size
 					&& fbuf[size - 2] == '\r'
diff --git a/tests/tests-c-compiler/check-src/check-119.-gen-PER.c b/tests/tests-c-compiler/check-src/check-119.-gen-PER.c
index 96ccc9f..3023303 100644
--- a/tests/tests-c-compiler/check-src/check-119.-gen-PER.c
+++ b/tests/tests-c-compiler/check-src/check-119.-gen-PER.c
@@ -189,8 +189,7 @@
 					fbuf_left, fbuf_offset, size);
 				assert(fbuf_offset == (ssize_t)size);
 			} else {
-				assert(fbuf_offset - size < 2
-				|| (fbuf_offset + 1 /* "\n" */  == (ssize_t)size
+				assert((fbuf_offset + 1 /* "\n" */  == (ssize_t)size
 					&& fbuf[size - 1] == '\n')
 				|| (fbuf_offset + 2 /* "\r\n" */  == (ssize_t)size
 					&& fbuf[size - 2] == '\r'
diff --git a/tests/tests-c-compiler/check-src/check-126.-gen-PER.c b/tests/tests-c-compiler/check-src/check-126.-gen-PER.c
index 9c08827..947640b 100644
--- a/tests/tests-c-compiler/check-src/check-126.-gen-PER.c
+++ b/tests/tests-c-compiler/check-src/check-126.-gen-PER.c
@@ -190,8 +190,7 @@
 				fbuf_left, fbuf_offset, size);
 			assert(fbuf_offset == (ssize_t)size);
 		} else {
-			assert(fbuf_offset - size < 2
-			|| (fbuf_offset + 1 /* "\n" */  == (ssize_t)size
+			assert((fbuf_offset + 1 /* "\n" */  == (ssize_t)size
 				&& fbuf[size - 1] == '\n')
 			|| (fbuf_offset + 2 /* "\r\n" */  == (ssize_t)size
 				&& fbuf[size - 2] == '\r'
diff --git a/tests/tests-c-compiler/check-src/check-131.-gen-PER.c b/tests/tests-c-compiler/check-src/check-131.-gen-PER.c
index 7cc744f..ed29315 100644
--- a/tests/tests-c-compiler/check-src/check-131.-gen-PER.c
+++ b/tests/tests-c-compiler/check-src/check-131.-gen-PER.c
@@ -25,7 +25,7 @@
 
 	printf("Checking uper_open_type_put():\n");
 	assert(0 == uper_open_type_put(&asn_DEF_T, 0, &t, &po));
-	assert(po.nbits == (-1 + sizeof(po.tmpspace)) * 8);
+	assert(po.nbits == (-1 + (int)sizeof(po.tmpspace)) * 8);
 	printf("po{nboff=%zd; nbits=%zd; buffer=%p; tmpspace=%p}\n",
 		po.nboff, po.nbits, po.buffer, po.tmpspace);
 	/* One byte length and one byte 0x00 */
diff --git a/tests/tests-c-compiler/check-src/check-70.-fwide-types.c b/tests/tests-c-compiler/check-src/check-70.-fwide-types.c
index 377663c..bd78c2f 100644
--- a/tests/tests-c-compiler/check-src/check-70.-fwide-types.c
+++ b/tests/tests-c-compiler/check-src/check-70.-fwide-types.c
@@ -154,8 +154,7 @@
 			if(how == AS_DER) {
 				assert(fbuf_offset == (ssize_t)size);
 			} else {
-				assert(fbuf_offset - size < 2
-				|| (fbuf_offset + 1 /* "\n" */  == (ssize_t)size
+				assert((fbuf_offset + 1 /* "\n" */  == (ssize_t)size
 					&& fbuf[size - 1] == '\n')
 				|| (fbuf_offset + 2 /* "\r\n" */  == (ssize_t)size
 					&& fbuf[size - 2] == '\r'
diff --git a/tests/tests-c-compiler/check-src/check-70.c b/tests/tests-c-compiler/check-src/check-70.c
index 6c10f09..6915163 100644
--- a/tests/tests-c-compiler/check-src/check-70.c
+++ b/tests/tests-c-compiler/check-src/check-70.c
@@ -143,8 +143,7 @@
 			if(how == AS_DER) {
 				assert(fbuf_offset == (ssize_t)size);
 			} else {
-				assert(fbuf_offset - size < 2
-				|| (fbuf_offset + 1 /* "\n" */  == (ssize_t)size
+				assert((fbuf_offset + 1 /* "\n" */  == (ssize_t)size
 					&& fbuf[size - 1] == '\n')
 				|| (fbuf_offset + 2 /* "\r\n" */  == (ssize_t)size
 					&& fbuf[size - 2] == '\r'