diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 688f8bf6a..d23921acc 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -169,8 +169,7 @@ if(USE_STATIC_MBEDTLS_LIBRARY)
     set_target_properties(${mbedcrypto_static_target} PROPERTIES OUTPUT_NAME mbedcrypto)
     target_link_libraries(${mbedcrypto_static_target} ${libs})
     target_include_directories(${mbedcrypto_static_target}
-        PUBLIC ${MBEDTLS_DIR}/include/
-        PUBLIC ${MBEDTLS_DIR}/crypto/include/)
+        PUBLIC ${MBEDTLS_DIR}/include/)
 
     if(USE_CRYPTO_SUBMODULE)
         install(TARGETS ${mbedcrypto_static_target}
@@ -197,22 +196,19 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
     set_target_properties(mbedcrypto PROPERTIES VERSION 2.21.0 SOVERSION 4)
     target_link_libraries(mbedcrypto ${libs})
     target_include_directories(mbedcrypto
-        PUBLIC ${MBEDTLS_DIR}/include/
-        PUBLIC ${MBEDTLS_DIR}/crypto/include/)
+        PUBLIC ${MBEDTLS_DIR}/include/)
 
     add_library(mbedx509 SHARED ${src_x509})
     set_target_properties(mbedx509 PROPERTIES VERSION 2.21.0 SOVERSION 1)
     target_link_libraries(mbedx509 ${libs} mbedcrypto)
     target_include_directories(mbedx509
-        PUBLIC ${MBEDTLS_DIR}/include/
-        PUBLIC ${MBEDTLS_DIR}/crypto/include/)
+        PUBLIC ${MBEDTLS_DIR}/include/)
 
     add_library(mbedtls SHARED ${src_tls})
     set_target_properties(mbedtls PROPERTIES VERSION 2.21.0 SOVERSION 13)
     target_link_libraries(mbedtls ${libs} mbedx509)
     target_include_directories(mbedtls
-        PUBLIC ${MBEDTLS_DIR}/include/
-        PUBLIC ${MBEDTLS_DIR}/crypto/include/)
+        PUBLIC ${MBEDTLS_DIR}/include/)
 
     if(USE_CRYPTO_SUBMODULE)
         install(TARGETS mbedcrypto
diff --git a/programs/fuzz/Makefile b/programs/fuzz/Makefile
index 5cde090d8..24dc7bad7 100644
--- a/programs/fuzz/Makefile
+++ b/programs/fuzz/Makefile
@@ -5,15 +5,12 @@ LOCAL_LDFLAGS = -L../../library			\
 		-lmbedx509$(SHARED_SUFFIX)	\
 		-lmbedcrypto$(SHARED_SUFFIX)
 
-LOCAL_LDFLAGS += -L../../crypto/library
-LOCAL_CFLAGS += -I../../crypto/include
-CRYPTO := ../../crypto/library/
-LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES))
+LOCAL_CFLAGS += $(patsubst -I../%,-I../../%,$(THIRDPARTY_INCLUDES))
 
 ifndef SHARED
-DEP=$(CRYPTO)libmbedcrypto.a ../../library/libmbedx509.a ../../library/libmbedtls.a
+DEP=../../library/libmbedcrypto.a ../../library/libmbedx509.a ../../library/libmbedtls.a
 else
-DEP=$(CRYPTO)libmbedcrypto.$(DLEXT) ../../library/libmbedx509.$(DLEXT) ../../library/libmbedtls.$(DLEXT)
+DEP=../../library/libmbedcrypto.$(DLEXT) ../../library/libmbedx509.$(DLEXT) ../../library/libmbedtls.$(DLEXT)
 endif
 
 
diff --git a/tests/scripts/check-test-cases.py b/tests/scripts/check-test-cases.py
index 31fc34c52..4abaa6882 100755
--- a/tests/scripts/check-test-cases.py
+++ b/tests/scripts/check-test-cases.py
@@ -54,10 +54,6 @@ def collect_test_directories():
     elif os.path.isdir('../suites'):
         tests_dir = '..'
     directories = [tests_dir]
-    crypto_tests_dir = os.path.normpath(os.path.join(tests_dir,
-                                                     '../crypto/tests'))
-    if os.path.isdir(crypto_tests_dir):
-        directories.append(crypto_tests_dir)
     return directories
 
 def check_description(results, seen, file_name, line_number, description):