diff --git a/Makefile b/Makefile
index 6b2f69069c9be44a06bad6f72dc89f9ee80d4d4f..c234bdd4e92c85b7f2e6efccad204e75de64daa6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-CC=mpicc
-CXX=mpicxx
-
+CC=gcc
+CXX=g++
 
+MPICC=mpicc
 
 FLAGS=-Wall -Wextra -Werror -fPIC -fno-rtti
 TEST_FLAGS=-Wall -Wextra
@@ -78,7 +78,7 @@ dots:
 	$(DOTD)/lock.svg
 
 $(TESTD)/%: $(TESTSRCD)/%.c
-	$(CC) $(GDB_GCC) $(TEST_FLAGS) $(PLUGIN_FLAGS) $^ -o $@ || echo "(exit 1)"
+	$(MPICC) $(GDB_GCC) $(TEST_FLAGS) $(PLUGIN_FLAGS) $^ -o $@ || echo "(exit 1)"
 
 $(OBJD)/%.o: $(SRCD)/%.cpp 
 	$(CXX) $(FLAGS) $(PLUGIN_INCLUDE) -c $^ -o $@