diff --git a/tests/SConscript b/tests/SConscript
index 94b432c..34720aa 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -31,8 +31,8 @@
 # vars is imported from arm_compute:
 variables = [
     #FIXME Switch the following two options to False before releasing
-    BoolVariable("validation_tests", "Build validation test programs", True),
-    BoolVariable("benchmark_tests", "Build benchmark test programs", True),
+    BoolVariable("validation_tests", "Build validation test programs", False),
+    BoolVariable("benchmark_tests", "Build benchmark test programs", False),
     ("test_filter", "Pattern to specify the tests' filenames to be compiled", "*.cpp")
 ]
 
@@ -71,10 +71,6 @@
     test_env.Append(LIBS = ["arm_compute_graph", "arm_compute", "arm_compute_core"])
     arm_compute_lib = arm_compute_graph_so
 
-#FIXME Delete before release
-if env['internal_only']:
-    test_env.Append(CPPDEFINES=['INTERNAL_ONLY'])
-
 common_files = Glob('*.cpp')
 common_objects = [test_env.StaticObject(f) for f in common_files]