diff --git a/pkg/tinycbor/Makefile b/pkg/tinycbor/Makefile
index 03c0cd4cfe114e485cca3a36d947efbad1645cf3..c8b0e042075da95370696b662965e869b4c0078e 100644
--- a/pkg/tinycbor/Makefile
+++ b/pkg/tinycbor/Makefile
@@ -1,6 +1,7 @@
 PKG_NAME=tinycbor
 PKG_URL=https://github.com/intel/tinycbor
-PKG_VERSION=v0.5.1
+# Tinycbor v0.5.2
+PKG_VERSION=d94ca09aa91f5b3c581527aa8bca179a82b79874
 PKG_LICENSE=MIT
 
 .PHONY: all
diff --git a/pkg/tinycbor/Makefile.include b/pkg/tinycbor/Makefile.include
index ce4074d8c1fede6888d5579a4116579a96e9b6b1..88b8300ad9df6f0587ca673b543d4014388cc8f7 100644
--- a/pkg/tinycbor/Makefile.include
+++ b/pkg/tinycbor/Makefile.include
@@ -1 +1,8 @@
 INCLUDES += -I$(PKGDIRBASE)/tinycbor/src
+
+ifeq (,$(filter tinycbor_float,$(USEMODULE)))
+  CFLAGS += -DCBOR_NO_FLOATING_POINT
+endif
+
+# Declare pseudomodules here to be selfcontained
+PSEUDOMODULES += tinycbor_%
diff --git a/tests/pkg_tinycbor/Makefile b/tests/pkg_tinycbor/Makefile
index 7e0102edd1386628d7e64f497befe6775fbb7d2f..300fff2f0d82d859c48652f6b6010c3a1e513afd 100644
--- a/tests/pkg_tinycbor/Makefile
+++ b/tests/pkg_tinycbor/Makefile
@@ -9,6 +9,8 @@ USEMODULE += embunit
 USEMODULE += fmt
 USEPKG += tinycbor
 
+USEMODULE += tinycbor_float
+
 TEST_ON_CI_WHITELIST += all
 include $(RIOTBASE)/Makefile.include
 
diff --git a/tests/pkg_tinycbor/main.c b/tests/pkg_tinycbor/main.c
index 59d3b95c531f566b01662f64b2d29d06ee8b8782..425d9ffc615d3b02a940fa1b6dce357885042ad4 100644
--- a/tests/pkg_tinycbor/main.c
+++ b/tests/pkg_tinycbor/main.c
@@ -52,6 +52,7 @@ const char *tests[] = {
     "f7",                  /* undefined               */
     "f8ff",                /* simple(255)             */
 
+#ifdef MODULE_TINYCBOR_FLOAT
     "f93c00",              /* 1.0                     */
     "f9bc00",              /* -1.0                    */
     "f903ff",              /* 6.097555160522461e-05   */
@@ -61,6 +62,7 @@ const char *tests[] = {
     "fa47800000",          /* 65536.0                 */
     "fb3ff199999999999a",  /* 1.1                     */
     "f97e00",              /* NaN                     */
+#endif
 
     "8300810000",          /* [ 0, [ 0], 0]           */
     "a26161016162820203",  /* { "a": 1, "b": [ 2, 3]} */