diff --git a/tests/api/test_dtls.c b/tests/api/test_dtls.c
index 6de406f10..2c8d3c9bb 100644
--- a/tests/api/test_dtls.c
+++ b/tests/api/test_dtls.c
@@ -19,14 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#ifdef HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#if !defined(WOLFSSL_USER_SETTINGS) && !defined(WOLFSSL_NO_OPTIONS_H)
-    #include <wolfssl/options.h>
-#endif
-#include <wolfssl/wolfcrypt/settings.h>
+#include <tests/unit.h>
 
 #ifdef NO_INLINE
     #include <wolfssl/wolfcrypt/misc.h>
@@ -38,7 +31,6 @@
 #include <wolfssl/ssl.h>
 #include <wolfssl/internal.h>
 
-#include <tests/unit.h>
 #include <tests/utils.h>
 #include <tests/api/test_dtls.h>
 
diff --git a/tests/utils.c b/tests/utils.c
index bbdd5cf53..2b78b3a67 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -19,18 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
-#ifdef HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#if !defined(WOLFSSL_USER_SETTINGS) && !defined(WOLFSSL_NO_OPTIONS_H)
-    #include <wolfssl/options.h>
-#endif
-#include <wolfssl/wolfcrypt/settings.h>
-
-#include <wolfssl/wolfcrypt/settings.h>
-#include <tests/utils.h>
 #include <tests/unit.h>
+#include <tests/utils.h>
 
 #ifdef HAVE_MANUAL_MEMIO_TESTS_DEPENDENCIES