diff --git a/tests/bin/hspice.pm b/tests/bin/hspice.pm
new file mode 100644
index 000000000..36e6948a0
--- /dev/null
+++ b/tests/bin/hspice.pm
@@ -0,0 +1,582 @@
+
+#
+#   hspice DC, AC and noise test routines
+#
+
+#
+#  Rel  Date            Who             Comments
+# ====  ==========      =============   ========
+#  1.3  06/21/07        Rob Jones       Verilog-A model support added
+#                                       HSPICE version detection updated
+#  1.2  06/30/06        Colin McAndrew/ Floating node support added
+#                       Rob Jones       Noise simulation added
+#                                       HSPICE version detection improved
+#  1.0  04/13/06        Colin McAndrew  Initial version
+#
+
+package simulate;
+$simulatorCommand="hspice";
+$netlistFile="hspiceCkt";
+use strict;
+
+sub version {
+    my($version);
+    if (!open(OF,">$simulate::netlistFile")) {
+        die("ERROR: cannot open file $simulate::netlistFile, stopped");
+    }
+    print OF "";
+    print OF "r1 1 0 1";
+    print OF "v1 1 0 1";
+    print OF ".op";
+    print OF ".end";
+    close(OF);
+    $version="unknown";
+    if (!open(SIMULATE,"$simulate::simulatorCommand $simulate::netlistFile 2>/dev/null|")) {
+        die("ERROR: cannot run $main::simulatorName, stopped");
+    }
+    while (<SIMULATE>) {
+        chomp;
+        if (s/.+HSPICE\s+-*\s*//) {
+            ($version=$_)=~s/\s+.*//;
+        }
+    }
+    close(SIMULATE);
+    if (! $main::debug) {
+        unlink($simulate::netlistFile);
+        unlink("$simulate::netlistFile.st0");
+        if (!opendir(DIRQA,".")) {
+            die("ERROR: cannot open directory ., stopped");
+        }
+        foreach (grep(/^$simulate::netlistFile\.ic/,readdir(DIRQA))) {unlink($_)}
+        closedir(DIRQA);
+        unlink("hspice.errors");
+        unlink("simout.tmp");
+    }
+    return($version);
+}
+
+sub runNoiseTest {
+    my($variant,$outputFile)=@_;
+    my($arg,$name,$value,$type,$pin,$noisePin);
+    my(@BiasList,$i,@Field);
+    my(@X,@Noise,$temperature,$biasVoltage,$sweepVoltage,$inData);
+
+#
+#   Make up the netlist, using a subckt to encapsulate the
+#   instance. This simplifies handling of the variants as
+#   the actual instance is driven by voltage-controlled
+#   voltage sources from the subckt pins, and the currents
+#   are fed back to the subckt pins using current-controlled
+#   current sources. Pin swapping, polarity reversal, and
+#   m-factor scaling can all be handled by simple modifications
+#   of this subckt.
+#
+
+    @X=();@Noise=();
+    $noisePin=$main::Outputs[0];
+    foreach $temperature (@main::Temperature) {
+        foreach $biasVoltage (split(/\s+/,$main::biasListSpec)) {
+            if ($main::fMin == $main::fMax) {
+                push(@X,@main::BiasSweepList);
+            }
+            foreach $sweepVoltage (@main::BiasSweepList) {
+                if (!open(OF,">$simulate::netlistFile")) {
+                    die("ERROR: cannot open file $simulate::netlistFile, stopped");
+                }
+                print OF "* Noise simulation for $main::simulatorName";
+                &generateCommonNetlistInfo($variant,$temperature);
+                print OF "vin dummy 0 0 ac 1";
+                print OF "rin dummy 0 rmod";
+                print OF ".model rmod r res=1 noise=0";
+                foreach $pin (@main::Pin) {
+                    if ($main::isFloatingPin{$pin}) {
+                        print OF "i_$pin $pin 0 0";
+                    } elsif ($pin eq $main::biasListPin) {
+                        print OF "v_$pin $pin 0 $biasVoltage";
+                    } elsif ($pin eq $main::biasSweepPin) {
+                        print OF "v_$pin $pin 0 $sweepVoltage";
+                    } else {
+                        print OF "v_$pin $pin 0 $main::BiasFor{$pin}";
+                    }
+                }
+                print OF "x1 ".join(" ",@main::Pin)." mysub";
+                print OF "fn 0 n_$noisePin v_$noisePin 1";
+                print OF "rn 0 n_$noisePin rmod";
+                print OF ".ac $main::frequencySpec";
+#               print OF ".noise v(n_$noisePin) vin $main::frequencySpec";
+                print OF ".noise v(n_$noisePin) vin ";
+                print OF ".print noise onoise";
+                print OF ".end";
+                close(OF);
+        
+#
+#   Run simulations and get the results
+#
+
+                if (!open(SIMULATE,"$simulate::simulatorCommand $simulate::netlistFile 2>/dev/null|")) {
+                    die("ERROR: cannot run $main::simulatorName, stopped");
+                }
+                $inData=0;
+                while (<SIMULATE>) {
+                    chomp;s/^\s+//;s/\s+$//;@Field=split;
+                    if (/freq\s+onoise/i) {$inData=1;<SIMULATE>;next}
+                    if ($#Field != 1) {$inData=0;}
+                    next if (!$inData);
+                    if ($main::fMin != $main::fMax) {
+                        push(@X,&modelQa::unScale($Field[0]));
+                    }
+                    push(@Noise,(&modelQa::unScale($Field[1]))**2);
+                }
+                close(SIMULATE);
+            }
+        }
+    }
+
+#
+#   Write the results to a file
+#
+
+    if (!open(OF,">$outputFile")) {
+        die("ERROR: cannot open file $outputFile, stopped");
+    }
+    if ($main::fMin == $main::fMax) {
+        printf OF ("V($main::biasSweepPin)");
+    } else {
+        printf OF ("Freq");
+    }
+    foreach (@main::Outputs) {
+        printf OF (" N($_)");
+    }
+    printf OF ("\n");
+    for ($i=0;$i<=$#X;++$i) {
+        if (defined($Noise[$i])) {printf OF ("$X[$i] $Noise[$i]\n")}
+    }
+    close(OF);
+
+#
+#   Clean up, unless the debug flag was specified
+#
+
+    if (! $main::debug) {
+        unlink($simulate::netlistFile);
+        unlink("$simulate::netlistFile.st0");
+        if (!opendir(DIRQA,".")) {
+            die("ERROR: cannot open directory ., stopped");
+        }
+        foreach (grep(/^$simulate::netlistFile\.ic/,readdir(DIRQA))) {unlink($_)}
+        closedir(DIRQA);
+    }
+}
+
+sub runAcTest {
+    my($variant,$outputFile)=@_;
+    my($arg,$name,$value,$type,$pin,$mPin,$fPin,%NextPin);
+    my(@BiasList,$i,@Field);
+    my(@X,$omega,%g,%c,$twoPi,$temperature,$biasVoltage,$sweepVoltage);
+    my($inData,$inResults,$outputLine);
+    $twoPi=8.0*atan2(1.0,1.0);
+
+#
+#   Make up the netlist, using a subckt to encapsulate the
+#   instance. This simplifies handling of the variants as
+#   the actual instance is driven by voltage-controlled
+#   voltage sources from the subckt pins, and the currents
+#   are fed back to the subckt pins using current-controlled
+#   current sources. Pin swapping, polarity reversal, and
+#   m-factor scaling can all be handled by simple modifications
+#   of this subckt.
+#
+
+    if (!open(OF,">$simulate::netlistFile")) {
+        die("ERROR: cannot open file $simulate::netlistFile, stopped");
+    }
+    print OF "* AC simulation for $main::simulatorName";
+    &generateCommonNetlistInfo($variant);
+    @BiasList=split(/\s+/,$main::biasListSpec);
+    print OF ".param vbias=$BiasList[0]";
+    print OF ".param vsweep=$main::BiasSweepList[0]";
+    foreach $pin (@main::Pin) {
+        if ($pin eq $main::Pin[0]) {
+            print OF ".param ac_$pin=1";
+        } else {
+            print OF ".param ac_$pin=0";
+        }
+        if ($main::isFloatingPin{$pin}) {
+            print OF "i_$pin $pin 0 0";
+        } elsif ($pin eq $main::biasListPin) {
+            print OF "v_$pin $pin 0 vbias ac ac_$pin";
+        } elsif ($pin eq $main::biasSweepPin) {
+            print OF "v_$pin $pin 0 vsweep ac ac_$pin";
+        } else {
+            print OF "v_$pin $pin 0 $main::BiasFor{$pin} ac ac_$pin";
+        }
+    }
+    print OF "x1 ".join(" ",@main::Pin)." mysub";
+    print OF ".ac $main::frequencySpec";
+    foreach $pin (@main::Pin) {print OF ".print ac ir(v_$pin) ii(v_$pin)"}
+    $NextPin{$main::Pin[0]}=$main::Pin[$#main::Pin];
+    for ($i=1;$i<=$#main::Pin;++$i) {
+        $NextPin{$main::Pin[$i]}=$main::Pin[$i-1];
+    }
+    foreach $temperature (@main::Temperature) {
+        foreach $biasVoltage (@BiasList) {
+            foreach $sweepVoltage (@main::BiasSweepList) {
+                foreach $pin (@main::Pin) {
+                    next if ($temperature == $main::Temperature[0] && $biasVoltage == $BiasList[0]
+                             && $sweepVoltage == $main::BiasSweepList[0] && $pin eq $main::Pin[0]);
+                    print OF ".alter";
+                    if ($biasVoltage == $BiasList[0] && $sweepVoltage == $main::BiasSweepList[0] && $pin eq $main::Pin[0]) {
+                        print OF ".temp $temperature";
+                    }
+                    if ($sweepVoltage == $main::BiasSweepList[0] && $pin eq $main::Pin[0]) {
+                        print OF ".param vbias=$biasVoltage";
+                    }
+                    if ($pin eq $main::Pin[0]) {
+                        print OF ".param vsweep=$sweepVoltage";
+                    }
+                    print OF ".param ac_$NextPin{$pin}=0";
+                    print OF ".param ac_$pin=1";
+                }
+            }
+        }
+    }
+    print OF ".end";
+    close(OF);
+
+#
+#   Run simulations and get the results
+#
+
+    foreach $mPin (@main::Pin) {
+        foreach $fPin (@main::Pin) {
+            @{$g{$mPin,$fPin}}=();
+            @{$c{$mPin,$fPin}}=();
+        }
+    }
+    for ($i=0;$i<$#main::Pin;++$i) {
+        $NextPin{$main::Pin[$i]}=$main::Pin[$i+1];
+    }
+    $NextPin{$main::Pin[$#main::Pin]}=$main::Pin[0];
+    if (!open(SIMULATE,"$simulate::simulatorCommand $simulate::netlistFile 2>/dev/null|")) {
+        die("ERROR: cannot run $main::simulatorName, stopped");
+    }
+    $inData=0;$inResults=0;
+    if ($main::fMin == $main::fMax) {
+        @X=();
+        foreach $temperature (@main::Temperature) {
+            foreach $biasVoltage (split(/\s+/,$main::biasListSpec)) {
+                push(@X,@main::BiasSweepList);
+            }
+        }
+    }
+    $fPin=$main::Pin[0];
+    while (<SIMULATE>) {
+        chomp;
+        if (/ac\s+analysis/i) {$inResults=1;$inData=0;next}
+        if (/job\s+concluded/) {$inResults=0;$fPin=$NextPin{$fPin}}
+        next if (!$inResults);
+        s/^\s+//;s/\s+$//;
+        if (/^v_([a-zA-z][a-zA-Z0-9]*)/) {$mPin=$1;$inData=1;next;}
+        @Field=split;
+        if ($#Field != 2
+            || &modelQa::unScale($Field[0]) !~ /^($main::number)$/
+            || &modelQa::unScale($Field[1]) !~ /^($main::number)$/
+            || &modelQa::unScale($Field[2]) !~ /^($main::number)$/) {
+            $inData=0;
+            next;
+        }
+        next if (! $inData);
+        if (($main::fMin != $main::fMax) && ($mPin eq $main::Pin[0]) && ($mPin eq $fPin)) {
+            push(@X,&modelQa::unScale($Field[0]));
+        }
+        $omega=$twoPi*&modelQa::unScale($Field[0]);
+        push(@{$g{$mPin,$fPin}},&modelQa::unScale($Field[1]));
+        if ($mPin eq $fPin) {
+            push(@{$c{$mPin,$fPin}},&modelQa::unScale($Field[2])/$omega);
+        } else {
+            push(@{$c{$mPin,$fPin}},-1*&modelQa::unScale($Field[2])/$omega);
+        }
+    }
+    close(SIMULATE);
+
+#
+#   Write the results to a file
+#
+
+    if (!open(OF,">$outputFile")) {
+        die("ERROR: cannot open file $outputFile, stopped");
+    }
+    if ($main::fMin == $main::fMax) {
+        printf OF ("V($main::biasSweepPin)");
+    } else {
+        printf OF ("Freq");
+    }
+    foreach (@main::Outputs) {
+        ($type,$mPin,$fPin)=split(/\s+/,$_);
+        printf OF (" $type($mPin,$fPin)");
+    }
+    printf OF ("\n");
+    for ($i=0;$i<=$#X;++$i) {
+        $outputLine="$X[$i]";
+        foreach (@main::Outputs) {
+            ($type,$mPin,$fPin)=split(/\s+/,$_);
+            if ($type eq "g") {
+                if (defined(${$g{$mPin,$fPin}}[$i])) {
+                    $outputLine.=" ${$g{$mPin,$fPin}}[$i]";
+                } else {
+                    undef($outputLine);last;
+                }
+            } else {
+                if (defined(${$c{$mPin,$fPin}}[$i])) {
+                    $outputLine.=" ${$c{$mPin,$fPin}}[$i]";
+                } else {
+                    undef($outputLine);last;
+                }
+            }
+        }
+        if (defined($outputLine)) {printf OF ("$outputLine\n")}
+    }
+    close(OF);
+
+#
+#   Clean up, unless the debug flag was specified
+#
+
+    if (! $main::debug) {
+        unlink($simulate::netlistFile);
+        unlink("$simulate::netlistFile.st0");
+        if (!opendir(DIRQA,".")) {
+            die("ERROR: cannot open directory ., stopped");
+        }
+        foreach (grep(/^$simulate::netlistFile\.ic/,readdir(DIRQA))) {unlink($_)}
+        closedir(DIRQA);
+        unlink("hspice.errors");
+        unlink("simout.tmp");
+    }
+}
+
+sub runDcTest {
+    my($variant,$outputFile)=@_;
+    my($arg,$name,$value,$i,$pin,@Field);
+    my(@BiasList,$start,$stop,$step);
+    my(@V,%DC,$temperature,$biasVoltage);
+    my($inData,$inResults);
+
+#
+#   Make up the netlist, using a subckt to encapsulate the
+#   instance. This simplifies handling of the variants as
+#   the actual instance is driven by voltage-controlled
+#   voltage sources from the subckt pins, and the currents
+#   are fed back to the subckt pins using current-controlled
+#   current sources. Pin swapping, polarity reversal, and
+#   m-factor scaling can all be handled by simple modifications
+#   of this subckt.
+#
+
+    if (!open(OF,">$simulate::netlistFile")) {
+        die("ERROR: cannot open file $simulate::netlistFile, stopped");
+    }
+    print OF "* DC simulation for $main::simulatorName";
+    &generateCommonNetlistInfo($variant);
+    @BiasList=split(/\s+/,$main::biasListSpec);
+    ($start,$stop,$step)=split(/\s+/,$main::biasSweepSpec);
+    $start-=$step;
+    print OF ".param vbias=$BiasList[0]";
+    foreach $pin (@main::Pin) {
+        if ($main::isFloatingPin{$pin}) {
+            print OF "i_$pin $pin 0 0";
+        } elsif ($pin eq $main::biasListPin) {
+            print OF "v_$pin $pin 0 vbias";
+        } elsif ($pin eq $main::biasSweepPin) {
+            print OF "v_$pin $pin 0 $start";
+        } else {
+            print OF "v_$pin $pin 0 $main::BiasFor{$pin}";
+        }
+    }
+    print OF "x1 ".join(" ",@main::Pin)." mysub";
+    print OF ".dc v_$main::biasSweepPin $main::biasSweepSpec";
+    foreach $pin (@main::Outputs) {
+        if ($main::isFloatingPin{$pin}) {
+            print OF ".print v($pin)"
+        } else {
+            print OF ".print i(v_$pin)"
+        }
+    }
+    foreach $temperature (@main::Temperature) {
+        foreach $biasVoltage (@BiasList) {
+            next if ($temperature == $main::Temperature[0] && $biasVoltage == $BiasList[0]);
+            print OF ".alter";
+            if ($biasVoltage == $BiasList[0]) {
+                print OF ".temp $temperature";
+            }
+            print OF ".param vbias=$biasVoltage";
+        }
+    }
+    print OF ".end";
+    close(OF);
+
+#
+#   Run simulations and get the results
+#
+
+    if (!open(SIMULATE,"$simulate::simulatorCommand $simulate::netlistFile 2>/dev/null|")) {
+        die("ERROR: cannot run $main::simulatorName, stopped");
+    }
+    $inData=0;$inResults=0;@V=();
+    foreach $pin (@main::Outputs) {@{$DC{$pin}}=()}
+    while (<SIMULATE>) {
+        chomp;
+        if (/dc\s+transfer\s+curves/i) {$inResults=1;$inData=0;next}
+        if (/job\s+concluded/) {$inResults=0}
+        next if (!$inResults);
+        s/^\s+//;s/\s+$//;
+        if (/^volt\s+(current|voltage)/) {
+            chomp($_=<SIMULATE>);s/^\s*(v_)?//;s/\s+$//;$pin=$_;$inData=1;next;
+        }
+        @Field=split;
+        if ($#Field != 1
+            || &modelQa::unScale($Field[0]) !~ /^($main::number)$/
+            || &modelQa::unScale($Field[1]) !~ /^($main::number)$/) {
+            $inData=0;next;
+        }
+        if ($pin eq $main::Outputs[0]) {
+            push(@V,&modelQa::unScale($Field[0]));
+        }
+        push(@{$DC{$pin}},&modelQa::unScale($Field[1]));
+    }
+    close(SIMULATE);
+
+#
+#   Write the results to a file
+#
+
+    if (!open(OF,">$outputFile")) {
+        die("ERROR: cannot open file $outputFile, stopped");
+    }
+    printf OF ("V($main::biasSweepPin)");
+    foreach $pin (@main::Outputs) {
+        if ($main::isFloatingPin{$pin}) {
+            printf OF (" V($pin)");
+        } else {
+            printf OF (" I($pin)");
+        }
+    }
+    printf OF ("\n");
+    for ($i=0;$i<=$#V;++$i) {
+        next if (abs($V[$i]-$start) < abs(0.1*$step)); # this is dummy first bias point
+        printf OF ("$V[$i]");
+        foreach $pin (@main::Outputs) {
+            printf OF (" ${$DC{$pin}}[$i]")
+        }
+        printf OF ("\n");
+    }
+    close(OF);
+
+#
+#   Clean up, unless the debug flag was specified
+#
+
+    if (! $main::debug) {
+        unlink($simulate::netlistFile);
+        unlink("$simulate::netlistFile.st0");
+        if (!opendir(DIRQA,".")) {
+            die("ERROR: cannot open directory ., stopped");
+        }
+        foreach (grep(/^$simulate::netlistFile\.ic/,readdir(DIRQA))) {unlink($_)}
+        closedir(DIRQA);
+        unlink("hspice.errors");
+        unlink("simout.tmp");
+    }
+}
+
+sub generateCommonNetlistInfo {
+    my($variant)=$_[0];
+    my(@Pin_x,$arg,$name,$value,$eFactor,$fFactor,$pin);
+    print OF ".option tnom=27 gmin=1e-15 abstol=1e-14 reltol=1e-8 ingold=2"; # default temp for HSPICE is 25
+    print OF ".temp $main::Temperature[0]";
+    if ($variant=~/^scale$/) {
+        print OF ".option scale=$main::scaleFactor";
+    }
+    if ($variant=~/^shrink$/) {
+        print OF ".option scale=".(1.0-$main::shrinkPercent*0.01);
+    }
+    if ($variant=~/_P/) {
+        $eFactor=-1;$fFactor=1;
+    } else {
+        $eFactor=1;$fFactor=-1;
+    }
+    if ($variant=~/^m$/) {
+        if ($main::outputNoise) {
+            $fFactor/=sqrt($main::mFactor);
+        } else {
+            $fFactor/=$main::mFactor;
+        }
+    }
+    if (defined($main::verilogaFile)) {
+        print OF ".hdl \"$main::verilogaFile\"";
+    }
+    foreach $pin (@main::Pin) {push(@Pin_x,"${pin}_x")}
+    print OF ".subckt mysub ".join(" ",@Pin_x);
+    foreach $pin (@main::Pin) {
+        if ($main::isFloatingPin{$pin}) { # assumed "dt" thermal pin, no scaling sign change
+            print OF "v_$pin ${pin} ${pin}_x 0";
+        } elsif ($variant=~/^Flip/ && defined($main::flipPin{$pin})) {
+            print OF "e_$pin ${pin}_v 0 $main::flipPin{$pin}_x 0 $eFactor";
+            print OF "v_$pin ${pin}_v ${pin} 0";
+            print OF "f_$pin $main::flipPin{$pin}_x 0 v_$pin   $fFactor";
+        } else {
+            print OF "e_$pin ${pin}_v 0 ${pin}_x 0 $eFactor";
+            print OF "v_$pin ${pin}_v ${pin} 0";
+            print OF "f_$pin ${pin}_x 0 v_$pin   $fFactor";
+        }
+    }
+    if (defined($main::verilogaFile)) {
+        if ($variant=~/_P/) {
+            print OF "${main::keyLetter}1 ".join(" ",@main::Pin)." $main::pTypeSelectionArguments";
+        } else {
+            print OF "${main::keyLetter}1 ".join(" ",@main::Pin)." $main::nTypeSelectionArguments";
+        }
+        if ($variant=~/^scale$/) {
+            print OF "+ scale=$main::scaleFactor";
+        }
+        if ($variant=~/^shrink$/) {
+            print OF "+ shrink=$main::shrinkPercent";
+        }
+    } else {
+        print OF "${main::keyLetter}1 ".join(" ",@main::Pin)." mymodel";
+    }
+    foreach $arg (@main::InstanceParameters) {
+        ($name,$value)=split(/=/,$arg);
+        if ($variant=~/^scale$/) {
+            if ($main::isLinearScale{$name}) {
+                $value/=$main::scaleFactor;
+            } elsif ($main::isAreaScale{$name}) {
+                $value/=$main::scaleFactor**2;
+            }
+        }
+        if ($variant=~/^shrink$/) {
+            if ($main::isLinearScale{$name}) {
+                $value/=(1.0-$main::shrinkPercent*0.01);
+            } elsif ($main::isAreaScale{$name}) {
+                $value/=(1.0-$main::shrinkPercent*0.01)**2;
+            }
+        }
+        print OF "+ $name=$value";
+    }
+    if ($variant eq "m") {
+        print OF "+ m=$main::mFactor";
+    }
+    if (!defined($main::verilogaFile)) {
+        if ($variant=~/_P/) {
+            print OF ".model mymodel $main::pTypeSelectionArguments";
+        } else {
+            print OF ".model mymodel $main::nTypeSelectionArguments";
+        }
+    }
+    foreach $arg (@main::ModelParameters) {
+        print OF "+ $arg";
+    }
+    print OF ".ends";
+}
+
+1;
diff --git a/tests/bin/run_cmc_check b/tests/bin/run_cmc_check
index e27f1c45d..3d7f50e3c 100755
--- a/tests/bin/run_cmc_check
+++ b/tests/bin/run_cmc_check
@@ -30,6 +30,8 @@ help() {
 
         ngspice            run tests and compare results ngspice
 
+        hspice             run tests and compare results hspice
+
         clean              remove all previously generated simulation results
 
         NOTE: if test results exist they are not resimulated
@@ -102,22 +104,38 @@ run_test() {
 
 
 #####
-##### ngspice tests
+##### tests
 #####
 
 ngspice() {
     run_test ngspice
 }
 
+hspice() {
+    run_test hspice
+}
 
 
+#####
+##### clean
+#####
+
 clean() {
     rm -rf ${qaResultsDirectory}/ngspice ngspiceCkt*
+    rm -rf ${qaResultsDirectory}/hspice hspiceCkt*
+}
+
+clean_ngspice() {
+    rm -rf ${qaResultsDirectory}/ngspice ngspiceCkt*
+}
+
+clean_hspice() {
+    rm -rf ${qaResultsDirectory}/hspice hspiceCkt*
 }
 
 
 all() {
-    ngspice
+    ngspice hspice
 }
 
 
@@ -143,7 +161,7 @@ done
 
 for arg in $@ ; do
     case "$arg" in
-        all | clean | ngspice)
+        all | clean | clean_ngspice | ngspice | clean_hspice | hspice)
             "$arg"
             ;;
         *)
diff --git a/tests/bsim3/nmos/run b/tests/bsim3/nmos/run
index b663012c2..ed96fa5ee 100755
--- a/tests/bsim3/nmos/run
+++ b/tests/bsim3/nmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_nmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/bsim3/pmos/run b/tests/bsim3/pmos/run
index 0883628de..ed96fa5ee 100755
--- a/tests/bsim3/pmos/run
+++ b/tests/bsim3/pmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_pmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/bsim4/nmos/run b/tests/bsim4/nmos/run
index b663012c2..ed96fa5ee 100755
--- a/tests/bsim4/nmos/run
+++ b/tests/bsim4/nmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_nmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/bsim4/pmos/run b/tests/bsim4/pmos/run
index 0883628de..ed96fa5ee 100755
--- a/tests/bsim4/pmos/run
+++ b/tests/bsim4/pmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_pmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/bsimsoi/nmos/run b/tests/bsimsoi/nmos/run
index b663012c2..ed96fa5ee 100755
--- a/tests/bsimsoi/nmos/run
+++ b/tests/bsimsoi/nmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_nmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/bsimsoi/pmos/run b/tests/bsimsoi/pmos/run
index 0883628de..ed96fa5ee 100755
--- a/tests/bsimsoi/pmos/run
+++ b/tests/bsimsoi/pmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_pmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/hisim/nmos/run b/tests/hisim/nmos/run
index b663012c2..ed96fa5ee 100755
--- a/tests/hisim/nmos/run
+++ b/tests/hisim/nmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_nmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/hisim/pmos/run b/tests/hisim/pmos/run
index 0883628de..ed96fa5ee 100755
--- a/tests/hisim/pmos/run
+++ b/tests/hisim/pmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_pmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/hisimhv1/nmos/run b/tests/hisimhv1/nmos/run
index b663012c2..ed96fa5ee 100755
--- a/tests/hisimhv1/nmos/run
+++ b/tests/hisimhv1/nmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_nmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/hisimhv1/pmos/run b/tests/hisimhv1/pmos/run
index 0883628de..ed96fa5ee 100755
--- a/tests/hisimhv1/pmos/run
+++ b/tests/hisimhv1/pmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_pmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/hisimhv2/nmos/run b/tests/hisimhv2/nmos/run
index b663012c2..ed96fa5ee 100755
--- a/tests/hisimhv2/nmos/run
+++ b/tests/hisimhv2/nmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_nmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log
diff --git a/tests/hisimhv2/pmos/run b/tests/hisimhv2/pmos/run
index 0883628de..ed96fa5ee 100755
--- a/tests/hisimhv2/pmos/run
+++ b/tests/hisimhv2/pmos/run
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-../../bin/run_cmc_check clean ngspice | tee cmcqa_pmos.log
+simulator="$1"
+if [ -z "$1" ] ; then
+  simulator="ngspice"
+fi 
+
+../../bin/run_cmc_check clean_${simulator} $simulator | tee cmcqa_${simulator}.log