diff --git a/.circleci/config.yml b/.circleci/config.yml
index bd66aecc..56ff9025 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,7 +106,7 @@ jobs:
             - v4-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
       - run:
           name: Run integration tests
-          command: WITH_LIBSNARK=1 RUSTFLAGS="-D warnings" ./full_test.sh
+          command: WITH_LIBSNARK=1 RUSTFLAGS="-D warnings" ./integration_test.sh
   deploy:
     docker:
       - image: circleci/python:latest-node
diff --git a/build.sh b/build.sh
index bfc66477..64994644 100755
--- a/build.sh
+++ b/build.sh
@@ -6,5 +6,5 @@ set -e
 if [ -n "$WITH_LIBSNARK" ]; then
 	cargo build --package zokrates_cli --features="libsnark"
 else
-	cargo build
+	cargo build --package zokrates_cli
 fi
\ No newline at end of file
diff --git a/build_release.sh b/build_release.sh
index b6a9960e..e0c727c2 100755
--- a/build_release.sh
+++ b/build_release.sh
@@ -6,5 +6,5 @@ set -e
 if [ -n "$WITH_LIBSNARK" ]; then
 	cargo build --release --package zokrates_cli --features="libsnark"
 else
-	cargo build --release
+	cargo build --release --package zokrates_cli
 fi
diff --git a/full_test.sh b/integration_test.sh
similarity index 68%
rename from full_test.sh
rename to integration_test.sh
index 30ef6bb7..a67993b2 100755
--- a/full_test.sh
+++ b/integration_test.sh
@@ -6,5 +6,5 @@ set -e
 if [ -n "$WITH_LIBSNARK" ]; then
 	cargo test --release --package zokrates_cli --features="libsnark" -- --ignored
 else
-	cargo test --release -- --ignored
+	cargo test --release --package zokrates_cli                       -- --ignored
 fi
\ No newline at end of file
diff --git a/test.sh b/test.sh
index 1ba82677..8b997573 100755
--- a/test.sh
+++ b/test.sh
@@ -4,7 +4,8 @@
 set -e
 
 if [ -n "$WITH_LIBSNARK" ]; then
-	cargo test --release --package zokrates_cli --features="libsnark"
-else
-	cargo test --release
-fi
+	# run specifically the libsnark tests inside zokrates_core
+	cargo test --release --package zokrates_core --features="libsnark" libsnark
+
+# run all tests without libsnark on
+cargo test --release