diff --git a/reactos/apps/tests/alive/Makefile b/reactos/apps/tests/alive/Makefile
index 4f5c13e28c0..959073dad64 100644
--- a/reactos/apps/tests/alive/Makefile
+++ b/reactos/apps/tests/alive/Makefile
@@ -6,7 +6,6 @@ PATH_TO_TOP=../..
 TARGET_NAME=alive
 
 OBJECTS=\
-	../common/crt0.o	\
 	$(TARGET_NAME).o
 
 LIBRARIES=\
@@ -41,7 +40,7 @@ $(PROGS:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%): $(PATH_TO_TOP)/$(DIST_DIR)/apps/%:
 	$(CP) $* $(PATH_TO_TOP)/$(DIST_DIR)/apps/$*
 
 $(TARGET_NAME).exe: $(OBJECTS)
-	$(LD)\
+	$(CC)\
 		$(OBJECTS)\
 		$(LIBRARIES)\
 		-o $(TARGET_NAME).exe
diff --git a/reactos/apps/tests/apc/makefile b/reactos/apps/tests/apc/makefile
index b3d413717e8..9a9e65431c5 100644
--- a/reactos/apps/tests/apc/makefile
+++ b/reactos/apps/tests/apc/makefile
@@ -5,7 +5,7 @@ PATH_TO_TOP = ../..
 
 CFLAGS = -g
 
-OBJECTS= ../common/crt0.o apc.o
+OBJECTS= apc.o
 PROGS= apc.exe
 
 BASE_CFLAGS = -I../../include
@@ -34,7 +34,7 @@ $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
 
 apc.exe: $(OBJECTS) $(LIBS)
-	$(LD) $(OBJECTS) $(LIBS) -o apc.exe
+	$(CC) $(OBJECTS) $(LIBS) -o apc.exe
 	$(NM) --numeric-sort apc.exe > apc.sym
 
 include ../../rules.mak
diff --git a/reactos/apps/tests/count/Makefile b/reactos/apps/tests/count/Makefile
index 3404aab1de4..f5f6692bc28 100644
--- a/reactos/apps/tests/count/Makefile
+++ b/reactos/apps/tests/count/Makefile
@@ -6,7 +6,6 @@ PATH_TO_TOP=../..
 TARGET_NAME=count
 
 OBJECTS=\
-	../common/crt0.o	\
 	$(TARGET_NAME).o
 
 LIBRARIES=\
@@ -41,7 +40,7 @@ $(PROGS:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%): $(PATH_TO_TOP)/$(DIST_DIR)/apps/%:
 	$(CP) $* $(PATH_TO_TOP)/$(DIST_DIR)/apps/$*
 
 $(TARGET_NAME).exe: $(OBJECTS)
-	$(LD)\
+	$(CC)\
 		$(OBJECTS)\
 		$(LIBRARIES)\
 		-o $(TARGET_NAME).exe
diff --git a/reactos/apps/tests/lpc/makefile b/reactos/apps/tests/lpc/makefile
index 0bd748b602c..433e1d0109d 100644
--- a/reactos/apps/tests/lpc/makefile
+++ b/reactos/apps/tests/lpc/makefile
@@ -3,8 +3,8 @@
 #
 PATH_TO_TOP = ../..
 
-SRV_OBJECTS= ../common/crt0.o lpcsrv.o
-CLT_OBJECTS= ../common/crt0.o lpcclt.o
+SRV_OBJECTS= lpcsrv.o
+CLT_OBJECTS= lpcclt.o
 
 PROGS= lpcsrv.exe lpcclt.exe
 
@@ -37,11 +37,11 @@ $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
 
 lpcsrv.exe: $(SRV_OBJECTS) $(LIBS)
-	$(LD) $(SRV_OBJECTS) $(LIBS) -o lpcsrv.exe
+	$(CC) $(SRV_OBJECTS) $(LIBS) -o lpcsrv.exe
 	$(NM) --numeric-sort lpcsrv.exe > lpcsrv.sym
 
 lpcclt.exe: $(CLT_OBJECTS) $(LIBS)
-	$(LD) $(CLT_OBJECTS) $(LIBS) -o lpcclt.exe
+	$(CC) $(CLT_OBJECTS) $(LIBS) -o lpcclt.exe
 	$(NM) --numeric-sort lpcclt.exe > lpcclt.sym
 
 
diff --git a/reactos/apps/tests/mstest/Makefile b/reactos/apps/tests/mstest/Makefile
index 0dbea99c7ff..45061969e94 100644
--- a/reactos/apps/tests/mstest/Makefile
+++ b/reactos/apps/tests/mstest/Makefile
@@ -3,8 +3,8 @@
 #
 PATH_TO_TOP = ../..
 
-SRV_OBJECTS = ../common/crt0.o msserver.o
-CLT_OBJECTS = ../common/crt0.o msclient.o
+SRV_OBJECTS = msserver.o
+CLT_OBJECTS = msclient.o
 
 PROGS = msserver.exe msclient.exe
 
@@ -33,11 +33,11 @@ $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
 
 msserver.exe: $(SRV_OBJECTS) $(LIBS)
-	$(LD) $(SRV_OBJECTS) $(LIBS) -o msserver.exe
+	$(CC) $(SRV_OBJECTS) $(LIBS) -o msserver.exe
 	$(NM) --numeric-sort msserver.exe > msserver.sym
 
 msclient.exe: $(CLT_OBJECTS) $(LIBS)
-	$(LD) $(CLT_OBJECTS) $(LIBS) -o msclient.exe
+	$(CC) $(CLT_OBJECTS) $(LIBS) -o msclient.exe
 	$(NM) --numeric-sort msclient.exe > msclient.sym
 
 
diff --git a/reactos/apps/tests/nptest/Makefile b/reactos/apps/tests/nptest/Makefile
index c9d975e81a5..c51f7f66919 100644
--- a/reactos/apps/tests/nptest/Makefile
+++ b/reactos/apps/tests/nptest/Makefile
@@ -3,8 +3,8 @@
 #
 PATH_TO_TOP = ../..
 
-SRV_OBJECTS = ../common/crt0.o npserver.o
-CLT_OBJECTS = ../common/crt0.o npclient.o
+SRV_OBJECTS = npserver.o
+CLT_OBJECTS = npclient.o
 
 PROGS = npserver.exe npclient.exe
 
@@ -33,11 +33,11 @@ $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
 
 npserver.exe: $(SRV_OBJECTS) $(LIBS)
-	$(LD) $(SRV_OBJECTS) $(LIBS) -o npserver.exe
+	$(CC) $(SRV_OBJECTS) $(LIBS) -o npserver.exe
 	$(NM) --numeric-sort npserver.exe > npserver.sym
 
 npclient.exe: $(CLT_OBJECTS) $(LIBS)
-	$(LD) $(CLT_OBJECTS) $(LIBS) -o npclient.exe
+	$(CC) $(CLT_OBJECTS) $(LIBS) -o npclient.exe
 	$(NM) --numeric-sort npclient.exe > npclient.sym
 
 
diff --git a/reactos/apps/tests/regtest/makefile b/reactos/apps/tests/regtest/makefile
index db0913fb1c5..fef288d4abd 100644
--- a/reactos/apps/tests/regtest/makefile
+++ b/reactos/apps/tests/regtest/makefile
@@ -3,7 +3,7 @@
 #
 PATH_TO_TOP = ../..
 
-OBJECTS= ../common/crt0.o regtest.o
+OBJECTS= regtest.o
 PROGS= regtest.exe
 LIBS= ../../lib/kernel32/kernel32.a ../../lib/ntdll/ntdll.a \
       ../../lib/advapi32/advapi32.a
@@ -32,7 +32,7 @@ $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
 
 regtest.exe: $(OBJECTS) $(LIBS)
-	$(CC) -nostartfiles -nostdlib $(OBJECTS) $(LIBS) -lgcc -o regtest.exe
+	$(CC) $(OBJECTS) $(LIBS) -o regtest.exe
 	$(NM) --numeric-sort regtest.exe > regtest.sym
 
 include ../../rules.mak
diff --git a/reactos/apps/tests/shm/makefile b/reactos/apps/tests/shm/makefile
index fe3674dc68e..00eb6b1ec81 100644
--- a/reactos/apps/tests/shm/makefile
+++ b/reactos/apps/tests/shm/makefile
@@ -3,8 +3,8 @@
 #
 PATH_TO_TOP = ../..
 
-SRV_OBJECTS= ../common/crt0.o shmsrv.o
-CLT_OBJECTS= ../common/crt0.o shmclt.o
+SRV_OBJECTS= shmsrv.o
+CLT_OBJECTS= shmclt.o
 
 PROGS= shmsrv.exe shmclt.exe
 
@@ -34,11 +34,11 @@ $(PROGS:%=../../$(DIST_DIR)/apps/%): ../../$(DIST_DIR)/apps/%: %
 	$(CP) $* ../../$(DIST_DIR)/apps/$*
 
 shmsrv.exe: $(SRV_OBJECTS) $(LIBS)
-	$(LD) $(SRV_OBJECTS) $(LIBS) -o shmsrv.exe
+	$(CC) $(SRV_OBJECTS) $(LIBS) -o shmsrv.exe
 	$(NM) --numeric-sort shmsrv.exe > shmsrv.sym
 
 shmclt.exe: $(CLT_OBJECTS) $(LIBS)
-	$(LD) $(CLT_OBJECTS) $(LIBS) -o shmclt.exe
+	$(CC) $(CLT_OBJECTS) $(LIBS) -o shmclt.exe
 	$(NM) --numeric-sort shmsrv.exe > shmclt.sym