diff --git a/src/lib-sieve/plugins/include/ext-include-common.c b/src/lib-sieve/plugins/include/ext-include-common.c
index de16f8b81984716322c7734a2411253120cd271b..b6be0f0d1163f95171fd4012835284277e0a7978 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.c
+++ b/src/lib-sieve/plugins/include/ext-include-common.c
@@ -98,7 +98,7 @@ const char *ext_include_get_script_directory
 
 		break;
    	case EXT_INCLUDE_LOCATION_GLOBAL:
-		sieve_dir = sieve_get_setting(svinst, "global_dir");
+		sieve_dir = sieve_get_setting(svinst, "sieve_global_dir");
 
 		if (sieve_dir == NULL) {
 			sieve_sys_error(
diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index 740d0a72b85b09e27d247cca8b6d8d2f7cb0ab11..fb8c9f5501c4f9bec8db3cc6675bf48167186759 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -56,7 +56,6 @@ testsuite_SOURCES = \
 	testsuite-smtp.c \
 	testsuite-mailstore.c \
 	testsuite-binary.c \
-	testsuite-settings.c \
 	$(commands) \
 	$(tests) \
 	ext-testsuite.c \
@@ -74,6 +73,5 @@ noinst_HEADERS = \
 	testsuite-result.h \
 	testsuite-smtp.h \
 	testsuite-mailstore.h \
-	testsuite-binary.h \
-	testsuite-settings.h
+	testsuite-binary.h
 
diff --git a/src/testsuite/testsuite-script.c b/src/testsuite/testsuite-script.c
index 6bcb05c02aff44f2f6b5fd1f997fd61f96c97729..aead203543f4f46f32c40ba6faabeb226fe89a66 100644
--- a/src/testsuite/testsuite-script.c
+++ b/src/testsuite/testsuite-script.c
@@ -5,7 +5,6 @@
 
 #include "sieve.h"
 #include "sieve-common.h"
-#include "sieve-settings.h"
 #include "sieve-script.h"
 #include "sieve-binary.h"
 #include "sieve-interpreter.h"
diff --git a/src/testsuite/testsuite-settings.c b/src/testsuite/testsuite-settings.c
index a038529f1c75de12202108d6d282c5fa696cc358..3b1171cee9bc35d2d82d5f3c3d8d84eba188f4b7 100644
--- a/src/testsuite/testsuite-settings.c
+++ b/src/testsuite/testsuite-settings.c
@@ -4,7 +4,6 @@
 #include "strfuncs.h"
 
 #include "sieve-common.h"
-#include "sieve-settings.h"
 
 #include "testsuite-common.h"
 #include "testsuite-settings.h"
@@ -42,7 +41,8 @@ void testsuite_settings_deinit(void)
 	hash_table_destroy(&settings);
 }
 
-const char *testsuite_setting_get(const char *identifier)
+const char *testsuite_setting_get
+(void *context ATTR_UNUSED, const char *identifier)
 {
 	struct testsuite_setting *setting = (struct testsuite_setting *) 
 		hash_table_lookup(settings, identifier);
diff --git a/src/testsuite/testsuite-settings.h b/src/testsuite/testsuite-settings.h
index 69e31c453b13d536b5ae0dbdc5521ef1ceaf9ff5..730ce8e3e8d0ca69613559b2ad5957e03f6a55c7 100644
--- a/src/testsuite/testsuite-settings.h
+++ b/src/testsuite/testsuite-settings.h
@@ -6,7 +6,7 @@
 void testsuite_settings_init(void);
 void testsuite_settings_deinit(void);
 
-const char *testsuite_setting_get(const char *identifier);
+const char *testsuite_setting_get(void *context, const char *identifier);
 void testsuite_setting_set(const char *identifier, const char *value);
 
 #endif /* __TESTSUITE_SETTINGS_H */
diff --git a/src/testsuite/testsuite.c b/src/testsuite/testsuite.c
index 8b820cd600f6977a222cff27104477a79a060a7f..3c6a4ee2e91a32580008b746c078e4f74f03e5b9 100644
--- a/src/testsuite/testsuite.c
+++ b/src/testsuite/testsuite.c
@@ -14,7 +14,6 @@
 #include "mail-storage-service.h"
 
 #include "sieve.h"
-#include "sieve-settings.h"
 #include "sieve-extensions.h"
 #include "sieve-script.h"
 #include "sieve-binary.h"
@@ -59,7 +58,7 @@ static void testsuite_tool_init(const char *extensions)
 {
 	testsuite_settings_init();
 
-	sieve_tool_init(&testsuite_sieve_callbacks);
+	sieve_tool_init(&testsuite_sieve_callbacks, FALSE);
 
 	sieve_extensions_set_string(sieve_instance, extensions);