diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index 39e2fce..1eaba6b 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -3458,7 +3458,7 @@
 
       if(!bMatched && pCallBack != NULL) {
          /* Call the callback on unmatched labels.
-	       * (It is tempting to do duplicate detection here, but that
+          * (It is tempting to do duplicate detection here, but that
           * would require dynamic memory allocation because the number
           * of labels that might be encountered is unbounded.) */
          uReturn = (*(pCallBack->pfCallback))(pCallBack->pCBContext, &Item);
diff --git a/test/float_tests.c b/test/float_tests.c
index 6e00472..b74d939 100644
--- a/test/float_tests.c
+++ b/test/float_tests.c
@@ -551,7 +551,7 @@
 
 
 /* Public function. See float_tests.h */
-int32_t 
+int32_t
 HalfPrecisionAgainstRFCCodeTest(void)
 {
    QCBORItem          Item;
@@ -689,7 +689,7 @@
 GeneralFloatEncodeTests(void)
 {
    /* See FloatNumberTests() for tests that really cover lots of float values.
-    * Add new tests for new values or decode modes there. 
+    * Add new tests for new values or decode modes there.
     * This test is primarily to cover all the float encode methods. */
 
    UsefulBufC Encoded;
@@ -753,7 +753,7 @@
 
 
 /* Public function. See float_tests.h */
-int32_t 
+int32_t
 GeneralFloatDecodeTests(void)
 {
    /* See FloatNumberTests() for tests that really cover lots of float values */
diff --git a/test/qcbor_decode_tests.c b/test/qcbor_decode_tests.c
index 2f56314..9fd70f9 100644
--- a/test/qcbor_decode_tests.c
+++ b/test/qcbor_decode_tests.c
@@ -10121,13 +10121,14 @@
 #endif /* !QCBOR_DISABLE_TAGS */
 #endif
 
+#ifndef QCBOR_DISABLE_NON_INTEGER_LABELS
+
 /* Simple value 1, not well formed */
 static const uint8_t spNWF[] = {0xf8, 0x01};
 
 static const uint8_t spArrayWithNWF[] = {0x81, 0xff};
 
 
-#ifndef QCBOR_DISABLE_NON_INTEGER_LABELS
 int32_t GetMapAndArrayTest(void)
 {
    QCBORDecodeContext DCtx;
@@ -10446,7 +10447,7 @@
 }
 #endif /* ! QCBOR_DISABLE_NON_INTEGER_LABELS */
 
-   
+
 int32_t
 ErrorHandlingTests(void)
 {