diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53a6db755..5e998b9d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -169,7 +169,7 @@ set_directory_properties(PROPERTIES EP_BASE External)
 
 option(NBT_BUILD_SHARED "Build NBT shared library" ON)
 option(NBT_USE_ZLIB "Build NBT library with zlib support" OFF)
-option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests.
+option(NBT_BUILD_TESTS "Build NBT library tests" ON)
 set(NBT_NAME Launcher_nbt++)
 set(NBT_DEST_DIR ${LIBRARY_DEST_DIR})
 add_subdirectory(libraries/libnbtplusplus)
diff --git a/libraries/libnbtplusplus b/libraries/libnbtplusplus
index 1320dde10..c1794059c 160000
--- a/libraries/libnbtplusplus
+++ b/libraries/libnbtplusplus
@@ -1 +1 @@
-Subproject commit 1320dde10d304ef01542207326f6ee955dddf0db
+Subproject commit c1794059cf4952d8183a344ebf2440d55d643503