diff --git a/scripts/ci b/scripts/ci
index 35f7703b5..9783fc880 100755
--- a/scripts/ci
+++ b/scripts/ci
@@ -5,8 +5,4 @@ cd "$(dirname $0)"
 
 ./build
 ./validate
-
-# TODO Enable return error detection when the CI env is ready
-set +e
 ./test
-set -e
diff --git a/scripts/validate b/scripts/validate
index 7c6fe3aae..95da6dec5 100755
--- a/scripts/validate
+++ b/scripts/validate
@@ -4,7 +4,6 @@ set -e
 cd "$(dirname $0)"/..
 
 ./generate_grpc.sh
-set +e
 
 echo Running proto validation