diff --git a/scripts/genie.lua b/scripts/genie.lua
index 1f394ca..918de54 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -40,6 +40,10 @@ project "bx.test"
 
 	debugdir (BX_DIR .. "tests")
 
+	removeflags {
+		"NoExceptions",
+	}
+
 	includedirs {
 		BX_DIR .. "include",
 		BX_THIRD_PARTY_DIR .. "UnitTest++/src/",
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 3bf1e84..fdd5c0d 100755
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -370,7 +370,10 @@ function toolchain(_buildDir, _libDir)
 		objdir (_buildDir .. "win64_" .. _ACTION .. "-clang/obj")
 
 	configuration { "winphone8*" }
-		removeflags { "StaticRuntime", "NoExceptions" }
+		removeflags {
+			"StaticRuntime",
+			"NoExceptions",
+		}
 
 	configuration { "mingw-*" }
 		defines { "WIN32" }
diff --git a/scripts/unittest++.lua b/scripts/unittest++.lua
index d880d24..a044831 100644
--- a/scripts/unittest++.lua
+++ b/scripts/unittest++.lua
@@ -3,26 +3,13 @@
 -- License: http://www.opensource.org/licenses/BSD-2-Clause
 --
 
-function flagsremove(name)
-	-- bx's toolchain.lua disables exceptions everywhere
-	-- this function can remove some of those flags when
-	-- needed.
-	local container, err = premake.getobject("solution")
-	for _, block in pairs(container["blocks"]) do
-		local tbl = block["flags"]
-		for index, value in pairs(tbl) do
-			if value == name then
-				table.remove(tbl, index)
-			end
-		end
-	end
-end
-
 project "UnitTest++"
 	uuid "ab932f5c-2409-11e3-b000-887628d43830"
 	kind "StaticLib"
 
-	flagsremove("NoExceptions")
+	removeflags {
+		"NoExceptions",
+	}
 
 	files {
 		"../3rdparty/UnitTest++/src/*.cpp",