diff --git a/examples/C/CMakeLists.txt b/examples/C/CMakeLists.txt
index ee7c54a3c..f7ab2d9f7 100644
--- a/examples/C/CMakeLists.txt
+++ b/examples/C/CMakeLists.txt
@@ -104,26 +104,20 @@ endforeach()
 ########################################################################
 # Tests which are conditional
 if( ENABLE_EXTRA_TESTS AND HAVE_ECCODES_THREADS )
-    # This one only for POSIX threads
-    ecbuild_add_executable( TARGET    c_grib_pthreads
-                            NOINSTALL
-                            SOURCES   grib_pthreads.c
-                            LIBS      eccodes
-    )
-    ecbuild_add_test( TARGET eccodes_c_grib_pthreads
-                      TYPE       SCRIPT
-                      COMMAND    ${CMAKE_CURRENT_SOURCE_DIR}/grib_pthreads.sh
-    )
-# TODO
-#    ecbuild_add_executable( TARGET    c_bufr_pthreads
-#                            NOINSTALL
-#                            SOURCES   bufr_pthreads.c
-#                            LIBS      eccodes
-#    )
-#    ecbuild_add_test( TARGET eccodes_c_bufr_pthreads
-#                      TYPE       SCRIPT
-#                      COMMAND    ${CMAKE_CURRENT_SOURCE_DIR}/bufr_pthreads.sh
-#    )
+    # For POSIX threads
+    LIST(APPEND pthread_tests grib_pthreads bufr_pthreads)
+    foreach( test ${pthread_tests} )
+        ecbuild_add_executable( TARGET    c_${test}
+                                NOINSTALL
+                                SOURCES   ${test}.c
+                                LIBS      eccodes
+        )
+        ecbuild_add_test( TARGET       eccodes_c_${test}
+                          TYPE         SCRIPT
+                          COMMAND      ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
+                          TEST_DEPENDS eccodes_download_gribs eccodes_download_bufrs
+        )
+    endforeach()
 endif()
 
 
diff --git a/examples/C/bufr_pthreads.c b/examples/C/bufr_pthreads.c
index a8afa2072..48e796a65 100644
--- a/examples/C/bufr_pthreads.c
+++ b/examples/C/bufr_pthreads.c
@@ -15,16 +15,30 @@
 #include "eccodes.h"
 #define NUM_THREADS 3
 
-static void* process_bufr(void* hand)
+static int DBL_EQUAL(double d1, double d2, double tolerance)
 {
-    codes_handle* h = (codes_handle*)hand;
-    long longVal = 0;
+    return fabs(d1-d2) <= tolerance;
+}
+
+static void* process_bufr(void* arg)
+{
+    codes_handle* h = (codes_handle*)arg;
+    long numSubsets = 0;
+    size_t size = 0;
+    double* dValues = NULL;
 
     CODES_CHECK(codes_set_long(h, "unpack", 1),0);
-    CODES_CHECK(codes_get_long(h,"numberOfSubsets", &longVal),0);
-    printf("numberOfSubsets=%ld\n", longVal);
+    CODES_CHECK(codes_get_long(h,"numberOfSubsets", &numSubsets),0);
+    /*printf("numberOfSubsets=%ld\n", numSubsets);*/
+    assert( numSubsets == 2016 || numSubsets == 128 );
 
-    codes_handle_delete(h);
+    dValues = (double*)malloc(numSubsets*sizeof(double));
+    assert(dValues);
+    size = numSubsets;
+    CODES_CHECK(codes_get_double_array(h, "latitude", dValues, &size), 0);
+    assert( DBL_EQUAL(dValues[0], 43.119, 0.01) || DBL_EQUAL(dValues[0], -58.174, 0.01) );
+
+    free(dValues);
     pthread_exit(NULL);
 }
 
@@ -32,46 +46,25 @@ int main(int argc, char** argv)
 {
     pthread_t thread1, thread2;
     int error = 0, err = 0;
-    long i = 0;
     FILE* fin = 0;
     codes_handle* h1 = 0;
     codes_handle* h2 = 0;
     fin = fopen("../../data/bufr/asca_139.bufr", "r");
-    h1 = codes_handle_new_from_file(NULL, fin, PRODUCT_BUFR, &err);
+    h1 = codes_handle_new_from_file(NULL, fin, PRODUCT_BUFR, &err); assert(h1);
     fclose(fin);
     fin = fopen("../../data/bufr/aaen_55.bufr", "r");
-    h2 = codes_handle_new_from_file(NULL, fin, PRODUCT_BUFR, &err);
+    h2 = codes_handle_new_from_file(NULL, fin, PRODUCT_BUFR, &err); assert(h2);
     fclose(fin);
 
-    printf("Start thread 1...\n");
-    error = pthread_create(&thread1, NULL, process_bufr, (void *)h1); if(error)return 1;
-    printf("Start thread 2...\n");
-    error = pthread_create(&thread2, NULL, process_bufr, (void *)h2); if(error)return 1;
-    printf("All done...\n");
-#if 0
-    for( i=0; i<NUM_THREADS; ++i) {
-        FILE* fin = 0;
-        char* filename = NULL;
-        codes_handle* h = 0;
-        int err = 0;
-        if ( i == 0 ) filename = "../../data/bufr/asca_139.bufr";
-        if ( i == 1 ) filename = "../../data/bufr/temp_101.bufr";
-        if ( i == 2 ) filename = "../../data/bufr/syno_1.bufr";
-        assert(filename);
-        fin = fopen(filename, "r");
-        assert(fin);
-        h = codes_handle_new_from_file(NULL, fin, PRODUCT_BUFR, &err);
-        assert(h);
-        printf("Creating thread %ld\n", i);
-        error = pthread_create(&threads[i], NULL, process_bufr, (void *)h);
-        if (error) {
-            return 1;
-        }
-        fclose(fin);
-    }
-#endif
+    error = pthread_create(&thread1, NULL, process_bufr, (void *)h1);
+    assert(!error);
+
+    error = pthread_create(&thread2, NULL, process_bufr, (void *)h2);
+    assert(!error);
+
     pthread_join( thread1, NULL);
     pthread_join( thread2, NULL);
-    /*pthread_exit(NULL);*/
+    codes_handle_delete(h1);
+    codes_handle_delete(h2);
     return 0;
 }
diff --git a/examples/C/bufr_pthreads.sh b/examples/C/bufr_pthreads.sh
index f8c15ead8..b64b22ea8 100755
--- a/examples/C/bufr_pthreads.sh
+++ b/examples/C/bufr_pthreads.sh
@@ -10,5 +10,6 @@
 . ./include.sh
 
 for i in `seq 0 100`; do
+   #echo iteration $i
    ${examples_dir}c_bufr_pthreads
 done