diff --git a/src/apps/terminal/spawn.cpp b/src/apps/terminal/spawn.cpp
index ec3dc2eebc..2a8c07d5f1 100644
--- a/src/apps/terminal/spawn.cpp
+++ b/src/apps/terminal/spawn.cpp
@@ -64,7 +64,7 @@ const char *kSpawnAlertMessage = "alert --stop " "'Cannot execute \"%s\":\n"
  * Set environment varriable.
  */
 
-#ifndef __HAIKU__
+#if !defined(__HAIKU__) || defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
 int
 setenv(const char *var, const char *value, bool overwrite)
 {
diff --git a/src/tests/servers/registrar/Jamfile b/src/tests/servers/registrar/Jamfile
index 1ff533e4f4..58510fb0a2 100644
--- a/src/tests/servers/registrar/Jamfile
+++ b/src/tests/servers/registrar/Jamfile
@@ -2,6 +2,7 @@ SubDir HAIKU_TOP src tests servers registrar ;
 
 SetSubDirSupportedPlatforms libbe_test ;
 
+UsePublicHeaders [ FDirName add-ons registrar ] ;
 UseArchHeaders $(TARGET_ARCH) ;
 
 
@@ -83,6 +84,7 @@ Server haiku_registrar
 	RosterAppInfo.cpp
 	RosterSettingsCharStream.cpp
 	ShutdownProcess.cpp
+	TextSnifferAddon.cpp
 	TRoster.cpp
 	Watcher.cpp
 	WatchingService.cpp