diff --git a/Makefile b/Makefile
index 9885595e..8da6dccf 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,6 @@ test-full: $(TEST)
 
 $(TEST): $(LIB)
 	$(COMP) $(FLAGS) $(DIRS) $(TEST)
-	cp $(TEST) tests/main && rm $(TEST)
 
 log:
 	cat _build/$(LOG) || true
diff --git a/bench/run b/bench/run
index c8b62ac5..9e1391ed 100755
--- a/bench/run
+++ b/bench/run
@@ -1,12 +1,13 @@
 #!/bin/bash
 
 CURDIR=`dirname $0`
+SOLVER="$CURDIR/../test.native"
 
 solvertest () {
     for f in `find -L $1 -name *.cnf -type f`
     do
         echo -ne "\r\033[KTesting $f..."
-        "$CURDIR/../tests/main" -t 5s -s 1G $f | grep $2 > /dev/null 2> /dev/null
+        "$SOLVER" -t 5s -s 1G $f | grep $2 > /dev/null 2> /dev/null
         RET=$?
         if [ $RET -ne 0 ];
         then
@@ -18,8 +19,8 @@ solvertest () {
 }
 
 all () {
-solvertest "$CURDIR/flatgraph/" "Sat"
-solvertest "$CURDIR/morphgraph/" "Sat"
+    solvertest "$CURDIR/flatgraph/" "Sat"
+    solvertest "$CURDIR/morphgraph/" "Sat"
 }
 
 time all
diff --git a/tests/pigeon/hole9.cnf b/tests/pigeon/hole9.cnf
index 66a03c49..36437c11 100644
--- a/tests/pigeon/hole9.cnf
+++ b/tests/pigeon/hole9.cnf
@@ -425,5 +425,4 @@ p cnf 90 415
  63     62     61     60     59     58     57     56     55   0
  72     71     70     69     68     67     66     65     64   0
  81     80     79     78     77     76     75     74     73   0
- 90     89     88     87     86     85     84     83     82
- 0
+ 90     89     88     87     86     85     84     83     82   0
diff --git a/tests/run b/tests/run
index 596e210d..9abf6c6f 100755
--- a/tests/run
+++ b/tests/run
@@ -1,10 +1,13 @@
 #!/bin/bash
 
+CURDIR=`dirname $0`
+SOLVER="$CURDIR/../test.native"
+
 solvertest () {
     for f in `find -L $1 -name *.cnf -type f`
     do
         echo -ne "\r\033[KTesting $f..."
-        tests/main -t 30s -s 1G $f | grep $2 > /dev/null 2> /dev/null
+        "$SOLVER" -t 30s -s 1G $f | grep $2 > /dev/null 2> /dev/null
         RET=$?
         if [ $RET -ne 0 ];
         then
@@ -15,5 +18,5 @@ solvertest () {
     echo -e "\r\033[K\e[32m[OK]\e[0m $2"
 }
 
-solvertest "tests/sat/" "Sat"
-solvertest "tests/unsat/" "Unsat"
+solvertest "$CURDIR/sat/" "Sat"
+solvertest "$CURDIR/unsat/" "Unsat"