diff --git a/ci/blackbox.sh b/ci/blackbox.sh
index 06f5957f..8a7d3657 100755
--- a/ci/blackbox.sh
+++ b/ci/blackbox.sh
@@ -92,22 +92,27 @@ case $DRIVER in
     rtlsim)
         DRIVER_PATH=$VORTEX_HOME/driver/rtlsim
         DRIVER_EXTRA=
+        CLEAN_TOKEN=clean
         ;;
     vlsim)
         DRIVER_PATH=$VORTEX_HOME/driver/opae
         DRIVER_EXTRA=vlsim
+        CLEAN_TOKEN=clean-vlsim
         ;;
     asesim)
         DRIVER_PATH=$VORTEX_HOME/driver/opae
         DRIVER_EXTRA=asesim
+        CLEAN_TOKEN=clean-asesim
         ;;
     fpga)
         DRIVER_PATH=$VORTEX_HOME/driver/opae
         DRIVER_EXTRA=fpga
+        CLEAN_TOKEN=clean-fpga
         ;; 
     simx)
         DRIVER_PATH=$VORTEX_HOME/driver/simx
         DRIVER_EXTRA=
+        CLEAN_TOKEN=clean
         ;;
     *)
         echo "invalid driver: $DRIVER"
@@ -134,7 +139,7 @@ CONFIGS="-DNUM_CLUSTERS=$CLUSTERS -DNUM_CORES=$CORES -DNUM_WARPS=$WARPS -DNUM_TH
 
 echo "CONFIGS=$CONFIGS"
 
-make -C $DRIVER_PATH clean
+make -C $DRIVER_PATH $CLEAN_TOKEN
 
 if [ $DEBUG -eq 1 ]
 then    
diff --git a/driver/opae/Makefile b/driver/opae/Makefile
index a00a3853..4264c2c0 100644
--- a/driver/opae/Makefile
+++ b/driver/opae/Makefile
@@ -100,10 +100,20 @@ $(ASE_DIR):
 .depend: $(SRCS)
 	$(CXX) $(CXXFLAGS) -MM $(SRCS) > .depend;
 
-clean:
-	rm -rf $(PROJECT) $(PROJECT_ASE) $(PROJECT_VLSIM) *.o .depend
+clean-fpga:
+	rm -rf $(PROJECT) *.o .depend
+
+clean-asesim:
+	rm -rf $(PROJECT_ASE) *.o .depend
+
+clean-vlsim:
 	$(MAKE) -C vlsim clean
 
+clean:
+	clean-fpga
+	clean-asesim
+	clean-vlsim
+
 ifneq ($(MAKECMDGOALS),clean)
     -include .depend
 endif