diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
index e59c4c1985..82a8a2a903 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
@@ -77,10 +77,11 @@ static int TestTLSThread( void *p )
 
 static void TestTLS()
 {
+#if defined(LINUX)
 	/* TLS won't work on older threads libraries, and may crash. */
 	if( !UsingNPTL() )
 		return;
-
+#endif
 	/* TLS won't work on older Linux kernels.  Do a simple check. */
 	g_iTestTLS = 1;
 
@@ -167,7 +168,7 @@ ArchHooks_Unix::ArchHooks_Unix()
 
 	InstallExceptionHandler();
 	
-#if defined(HAVE_TLS)
+#if defined(HAVE_TLS) && !defined(BSD)
 	TestTLS();
 #endif
 }