diff --git a/Sconstruct b/Sconstruct
index e7f739f3..b41912cd 100644
--- a/Sconstruct
+++ b/Sconstruct
@@ -4,7 +4,6 @@ import os
 # Configuration variables
 CONFIG_VERSION = "6.3"
 CONFIG_DEBUG   = True
-CONFIG_TEST_VALGRIND = False
 
 
 # Set up default environment
@@ -15,7 +14,6 @@ if CONFIG_DEBUG == True:
 class OEnvironment(Environment):
 	Debug    = False
 	Version  = 0
-	Valgrind = False
 
 	def __init__(self, CCFLAGS = CONFIG_CCFLAGS):
 		Environment.__init__(self, CCFLAGS = CCFLAGS)
@@ -25,7 +23,6 @@ class OEnvironment(Environment):
 		self.Append(LINKCOMSTR = "Linking $TARGET")
 		self.Debug = CONFIG_DEBUG
 		self.Version = CONFIG_VERSION
-		self.Valgrind = CONFIG_TEST_VALGRIND
 
 	def UsePackage(self, name):
 		self.ParseConfig("pkg-config --cflags --libs %s" % name)
diff --git a/tests/Sconscript b/tests/Sconscript
index f9c24411..1d8e6960 100644
--- a/tests/Sconscript
+++ b/tests/Sconscript
@@ -4,9 +4,6 @@ Import("test_env")
 
 test_env.DEBUG = True
 
-valgrind = ""
-if test_env.Valgrind == True:
-	valgrind = "valgrind -q --error-exitcode=42"
 res = []
 
 def all_tests_enabled(dir):
@@ -32,8 +29,6 @@ def get_test_obj(name, dir):
 	return None
 
 def generic_test(name, dir, objs, extra):
-	global valgrind
-
 	obj = get_test_obj(name, dir)
 	test_objs = extra
 	if obj != None:
@@ -41,7 +36,7 @@ def generic_test(name, dir, objs, extra):
 		test_objs = extra + objs
 
 	exe  = test_env.Program(name, [ "%s.cpp" % name ] + test_objs)
-	test = Command("%s.fake" % name, [], "%s tests/%s/%s" % (valgrind, dir, name))
+	test = Command("%s.fake" % name, [], "tests/%s/%s" % (dir, name))
 
 	Alias("tests/%s/%s" % (dir, name), test)
 	Depends(test, exe)