diff --git a/tests/C/forloop/Makefile b/tests/C/forloop/Makefile
index 83ab5e5..1b54a52 100644
--- a/tests/C/forloop/Makefile
+++ b/tests/C/forloop/Makefile
@@ -2,7 +2,7 @@ TARGET   = forloop
 
 TARGET_ARCH=riscv32
 
-CC       = riscv32-unknown-linux-gnu-gcc
+CC       = riscv32-unknown-elf-gcc
 # compiling flags here
 #CFLAGS   = -Wall -I. -O0 -nostartfiles  -march=rv32i -mabi=ilp32
 CFLAGS = -Wall -I. -O0 -nostdlib -march=rv32i -mabi=ilp32 --entry main
@@ -31,8 +31,8 @@ rm       = rm -f
 
 $(BINDIR)/$(TARGET): $(OBJECTS)
 #	$(LINKER) $(OBJECTS) $(LFLAGS) $(LIBS) $(LIBDIR) -o $@
-	riscv32-unknown-linux-gnu-objdump -d $< > dump
-	objcopy -Oihex $< $(TARGET).hex
+	#riscv32-unknown-elf-objcopy -d $< > dump
+	riscv32-unknown-elf-objcopy -Oihex $< $(TARGET).hex
 #	@echo "Linking complete!"
 
 $(OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.c
diff --git a/tests/C/func1/Makefile b/tests/C/func1/Makefile
index 930f3f7..7bbc725 100644
--- a/tests/C/func1/Makefile
+++ b/tests/C/func1/Makefile
@@ -29,7 +29,7 @@ rm       = rm -f
 
 $(BINDIR)/$(TARGET): $(OBJECTS)
 #	$(LINKER) $(OBJECTS) $(LFLAGS) $(LIBS) $(LIBDIR) -o $@
-	riscv32-unknown-linux-gnu-objdump -d $< > dump
+	riscv32-unknown-elf-objdump -d $< > dump
 	objcopy -Oihex $< $(TARGET).hex
 #	@echo "Linking complete!"
 
diff --git a/tests/C/func5/Makefile b/tests/C/func5/Makefile
index 922d4e5..d8ab0a5 100644
--- a/tests/C/func5/Makefile
+++ b/tests/C/func5/Makefile
@@ -29,7 +29,7 @@ rm       = rm -f
 
 $(BINDIR)/$(TARGET): $(OBJECTS)
 #	$(LINKER) $(OBJECTS) $(LDFLAGS) $(LIBS) $(LIBDIR) -o $@
-	riscv32-unknown-linux-gnu-objdump -d $< > dump
+	riscv32-unknown-elf-objdump -d $< > dump
 	objcopy -Oihex $< $(TARGET).hex
 #	@echo "Linking complete!"
 
diff --git a/tests/C/func6/Makefile b/tests/C/func6/Makefile
index d7b7eb3..d0eb4d5 100644
--- a/tests/C/func6/Makefile
+++ b/tests/C/func6/Makefile
@@ -8,7 +8,7 @@ CC       = riscv32-unknown-elf-gcc
 CFLAGS = -Wall -I. -O0 -static -march=rv32imac -mabi=ilp32 --specs=nosys.specs
 
 
-LINKER   = riscv32-unknown-linux-gnu-gcc
+LINKER   = riscv32-unknown-elf-gcc
 # linking flags here
 LDFLAGS   = -I. --entry main -L/opt/riscv/riscv32-unknown-elf/lib/ -T ld_script.ld
 LIBS   = $(EXTRA_LIBS)
@@ -30,7 +30,7 @@ rm       = rm -f
 
 $(BINDIR)/$(TARGET): $(OBJECTS)
 #	$(LINKER) $(OBJECTS) $(LDFLAGS) $(LIBS) $(LIBDIR) -o $@
-	riscv32-unknown-linux-gnu-objdump -d $< > dump
+	riscv32-unknown-elf-objdump -d $< > dump
 	objcopy -Oihex $< $(TARGET).hex
 #	@echo "Linking complete!"
 
diff --git a/tests/C/long_test1/Makefile b/tests/C/long_test1/Makefile
index 7e1030b..837ff9b 100644
--- a/tests/C/long_test1/Makefile
+++ b/tests/C/long_test1/Makefile
@@ -32,7 +32,7 @@ rm       = rm -f
 $(BINDIR)/$(TARGET): $(OBJECTS)
 #	$(LINKER) $(OBJECTS) $(LDFLAGS) $(LIBS) $(LIBDIR) -o $@
 	riscv32-unknown-linux-gnu-objdump -d $< > dump
-	objcopy -Oihex $< $(TARGET).hex
+	riscv32-unknown-elf-objcopy -Oihex $< $(TARGET).hex
 #	@echo "Linking complete!"
 
 $(OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.c
diff --git a/tests/C/stdlibs/Makefile b/tests/C/stdlibs/Makefile
index 5e76e8a..6a8b281 100644
--- a/tests/C/stdlibs/Makefile
+++ b/tests/C/stdlibs/Makefile
@@ -29,7 +29,7 @@ rm       = rm -f
 
 $(BINDIR)/$(TARGET): $(OBJECTS)
 #	$(LINKER) $(OBJECTS) $(LFLAGS) $(LIBS) $(LIBDIR) -o $@
-	riscv32-unknown-linux-gnu-objdump -d $< > dump
+	riscv32-unknown-elf-objdump -d $< > dump
 	objcopy -Oihex $< $(TARGET).hex
 #	@echo "Linking complete!"