diff --git a/lib/krb5/test_store.c b/lib/krb5/test_store.c
index 6b930775c..5fac75cd1 100644
--- a/lib/krb5/test_store.c
+++ b/lib/krb5/test_store.c
@@ -44,12 +44,12 @@ test_int8(krb5_context context, krb5_storage *sp)
 
     krb5_storage_truncate(sp, 0);
 
-    for (i = 0; i < sizeof(val[0])/sizeof(val); i++) {
+    for (i = 0; i < sizeof(val)/sizeof(val[0]); i++) {
 
 	ret = krb5_store_int8(sp, val[i]);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_store_int8");
-	krb5_storage_seek(sp, 0, SEEK_SET);
+	krb5_storage_seek(sp, i, SEEK_SET);
 	ret = krb5_ret_int8(sp, &v);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_ret_int8");
@@ -69,12 +69,12 @@ test_int16(krb5_context context, krb5_storage *sp)
 
     krb5_storage_truncate(sp, 0);
 
-    for (i = 0; i < sizeof(val[0])/sizeof(val); i++) {
+    for (i = 0; i < sizeof(val)/sizeof(val[0]); i++) {
 
 	ret = krb5_store_int16(sp, val[i]);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_store_int16");
-	krb5_storage_seek(sp, 0, SEEK_SET);
+	krb5_storage_seek(sp, i * sizeof (v), SEEK_SET);
 	ret = krb5_ret_int16(sp, &v);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_ret_int16");
@@ -94,12 +94,12 @@ test_int32(krb5_context context, krb5_storage *sp)
 
     krb5_storage_truncate(sp, 0);
 
-    for (i = 0; i < sizeof(val[0])/sizeof(val); i++) {
+    for (i = 0; i < sizeof(val)/sizeof(val[0]); i++) {
 
 	ret = krb5_store_int32(sp, val[i]);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_store_int32");
-	krb5_storage_seek(sp, 0, SEEK_SET);
+	krb5_storage_seek(sp, i * sizeof (v), SEEK_SET);
 	ret = krb5_ret_int32(sp, &v);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_ret_int32");
@@ -119,12 +119,12 @@ test_uint8(krb5_context context, krb5_storage *sp)
 
     krb5_storage_truncate(sp, 0);
 
-    for (i = 0; i < sizeof(val[0])/sizeof(val); i++) {
+    for (i = 0; i < sizeof(val)/sizeof(val[0]); i++) {
 
 	ret = krb5_store_uint8(sp, val[i]);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_store_uint8");
-	krb5_storage_seek(sp, 0, SEEK_SET);
+	krb5_storage_seek(sp, i * sizeof (v), SEEK_SET);
 	ret = krb5_ret_uint8(sp, &v);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_ret_uint8");
@@ -144,12 +144,12 @@ test_uint16(krb5_context context, krb5_storage *sp)
 
     krb5_storage_truncate(sp, 0);
 
-    for (i = 0; i < sizeof(val[0])/sizeof(val); i++) {
+    for (i = 0; i < sizeof(val)/sizeof(val[0]); i++) {
 
 	ret = krb5_store_uint16(sp, val[i]);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_store_uint16");
-	krb5_storage_seek(sp, 0, SEEK_SET);
+	krb5_storage_seek(sp, i * sizeof (v), SEEK_SET);
 	ret = krb5_ret_uint16(sp, &v);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_ret_uint16");
@@ -169,12 +169,12 @@ test_uint32(krb5_context context, krb5_storage *sp)
 
     krb5_storage_truncate(sp, 0);
 
-    for (i = 0; i < sizeof(val[0])/sizeof(val); i++) {
+    for (i = 0; i < sizeof(val)/sizeof(val[0]); i++) {
 
 	ret = krb5_store_uint32(sp, val[i]);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_store_uint32");
-	krb5_storage_seek(sp, 0, SEEK_SET);
+	krb5_storage_seek(sp, i * sizeof (v), SEEK_SET);
 	ret = krb5_ret_uint32(sp, &v);
 	if (ret)
 	    krb5_err(context, 1, ret, "krb5_ret_uint32");
@@ -220,12 +220,12 @@ test_truncate(krb5_context context, krb5_storage *sp, int fd)
 static void
 check_too_large(krb5_context context, krb5_storage *sp)
 {
-    uint32_t too_big_sizes[] = { INT_MAX, INT_MAX / 2, INT_MAX / 4, INT_MAX / 8 + 1};
+    uint32_t too_big_sizes[] = { UINT_MAX, UINT_MAX / 2, UINT_MAX / 4, UINT_MAX / 8 + 1};
     krb5_error_code ret;
     krb5_data data;
     size_t n;
 
-    for (n = 0; n < sizeof(too_big_sizes) / sizeof(too_big_sizes); n++) {
+    for (n = 0; n < sizeof(too_big_sizes) / sizeof(too_big_sizes[0]); n++) {
 	krb5_storage_truncate(sp, 0);
 	krb5_store_uint32(sp, too_big_sizes[n]);
 	krb5_storage_seek(sp, 0, SEEK_SET);