diff --git a/test/run_tests.c b/test/run_tests.c
index f28f526..f2baaf1 100644
--- a/test/run_tests.c
+++ b/test/run_tests.c
@@ -99,8 +99,11 @@
     TEST_ENTRY(BasicEncodeTest),
     TEST_ENTRY(NestedMapTest),
     TEST_ENTRY(BignumParseTest),
+#ifndef QCBOR_DISABLE_TAGS
     TEST_ENTRY(OptTagParseTest),
     TEST_ENTRY(DateParseTest),
+    TEST_ENTRY(DecodeTaggedTypeTests),
+#endif /* QCBOR_DISABLE_TAGS */
     TEST_ENTRY(SpiffyDateDecodeTest),
     TEST_ENTRY(ShortBufferParseTest2),
     TEST_ENTRY(ShortBufferParseTest),
@@ -136,12 +139,12 @@
     TEST_ENTRY(EncodeLengthThirtyoneTest),
     TEST_ENTRY(CBORSequenceDecodeTests),
     TEST_ENTRY(IntToTests),
-    TEST_ENTRY(DecodeTaggedTypeTests),
     TEST_ENTRY(PeekAndRewindTest),
-#ifndef     QCBOR_DISABLE_EXP_AND_MANTISSA
-    TEST_ENTRY(EncodeLengthThirtyoneTest),
+#ifndef QCBOR_DISABLE_EXP_AND_MANTISSA
     TEST_ENTRY(ExponentAndMantissaDecodeTests),
+#ifndef QCBOR_DISABLE_TAGS
     TEST_ENTRY(ExponentAndMantissaDecodeFailTests),
+#endif /* QCBOR_DISABLE_TAGS */
     TEST_ENTRY(ExponentAndMantissaEncodeTests),
 #endif /* QCBOR_DISABLE_EXP_AND_MANTISSA */
     TEST_ENTRY(ParseEmptyMapInMapTest),