diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c
index 343ea557..5dfaf8e1 100644
--- a/src/bin/jp2/opj_compress.c
+++ b/src/bin/jp2/opj_compress.c
@@ -345,10 +345,10 @@ OPJ_PROG_ORDER give_progression(char progression[4]) {
 	return PROG_UNKNOWN;
 }
 
-int get_num_images(char *imgdirpath){
+unsigned int get_num_images(char *imgdirpath){
 	DIR *dir;
 	struct dirent* content;
-	int num_images = 0;
+	unsigned int num_images = 0;
 
 	/*Reading the input images from given input directory*/
 
@@ -1597,7 +1597,7 @@ int main(int argc, char **argv) {
 
 	char indexfilename[OPJ_PATH_LEN];	/* index file name */
 
-	int i, num_images, imageno;
+	unsigned int i, num_images, imageno;
 	img_fol_t img_fol;
 	dircnt_t *dirptr = NULL;
 
diff --git a/tests/unit/testempty1.c b/tests/unit/testempty1.c
index 5e1ad631..19daa67d 100644
--- a/tests/unit/testempty1.c
+++ b/tests/unit/testempty1.c
@@ -71,9 +71,7 @@ int main(int argc, char *argv[])
   opj_image_t *image;
   opj_event_mgr_t event_mgr;
   opj_codec_t* l_codec = 00;
-  opj_cio_t *cio;
   opj_bool bSuccess;
-  size_t codestream_length;
   FILE *f;
 	opj_stream_t *l_stream = 00;
   (void)argc;
diff --git a/tests/unit/testempty2.c b/tests/unit/testempty2.c
index fe00d13d..3c961a89 100644
--- a/tests/unit/testempty2.c
+++ b/tests/unit/testempty2.c
@@ -73,9 +73,7 @@ int main(int argc, char *argv[])
   opj_image_t *image;
   opj_event_mgr_t event_mgr;
   opj_codec_t* l_codec = 00;
-  opj_cio_t *cio;
   opj_bool bSuccess;
-  size_t codestream_length;
   FILE *f;
 	opj_stream_t *l_stream = 00;
   (void)argc;
@@ -138,9 +136,7 @@ int main(int argc, char *argv[])
 
   /* read back the generated file */
 {
-  size_t file_length;
   FILE *fsrc = fopen(outputfile, "rb");
-  unsigned char *src;
   opj_codec_t* d_codec = 00;
 	opj_dparameters_t dparameters;
   assert( fsrc );