diff --git a/sim/testfloat.do b/sim/testfloat.do
index c6573a07..b2fb2e1d 100644
--- a/sim/testfloat.do
+++ b/sim/testfloat.do
@@ -29,19 +29,17 @@ vlog +incdir+../config/$1 +incdir+../config/shared ../testbench/testbench-fp.sv
 
 vsim -voptargs=+acc work.testbenchfp -G TEST=$2
 
-#-- display input and output signals as hexidecimal values
-if {$3 == "wave"} {
+# Determine if nowave argument is provided
+#   this removes any output to a wlf or wave window to reduce
+#   disk space.
+if {($argc > 2) && ($3 eq "nowave")} {
+    puts "No wave output is selected"
+} else {
     puts "wave output is selected"
     view wave
     add log -recursive /*
-    do wave-fpu.do
-} elseif {$3 == "nowave"} {
-    puts "No wave output is selected"
-} else {
-    puts "Error with third argument"
-    exit 2
-}
-  
+    do wave-fpu.do    
+}  
 
 #-- Run the Simulation 
 run -all