groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [groovy] branch master updated: don't use deprecated version of class
Date Thu, 19 Sep 2019 11:29:28 GMT
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 49c6df7  don't use deprecated version of class
49c6df7 is described below

commit 49c6df78406d3bfa994ed6cbebc35507a2fb5beb
Author: Paul King <paulk@asert.com.au>
AuthorDate: Thu Sep 19 21:28:46 2019 +1000

    don't use deprecated version of class
---
 config/codenarc/codenarc.groovy                    |  2 +-
 gradle/docs.gradle                                 |  6 ++--
 .../groovy/runtime/DefaultGroovyMethods.java       |  4 +--
 src/spec/doc/core-metaprogramming.adoc             |  2 +-
 src/spec/test/BaseScriptSpecTest.groovy            |  1 +
 src/spec/test/ClassDesignASTTransformsTest.groovy  |  2 ++
 src/spec/test/ClassTest.groovy                     |  2 ++
 src/spec/test/CloningASTTransformsTest.groovy      |  2 ++
 src/spec/test/ClosuresSpecTest.groovy              |  2 ++
 .../test/CodeGenerationASTTransformsTest.groovy    |  2 ++
 src/spec/test/CoercionTest.groovy                  |  2 ++
 src/spec/test/CommandChainsTest.groovy             |  2 ++
 .../CompilerDirectivesASTTransformsTest.groovy     |  2 ++
 src/spec/test/CustomizersTest.groovy               |  2 ++
 .../DeclarativeConcurrencyASTTransformsTest.groovy |  2 ++
 src/spec/test/DelegatesToSpecTest.groovy           |  2 ++
 src/spec/test/DesignPatternsTest.groovy            |  2 +-
 src/spec/test/DifferencesFromJavaTest.groovy       |  2 ++
 src/spec/test/ExtensionModuleSpecTest.groovy       |  2 ++
 src/spec/test/IntegrationTest.groovy               |  2 ++
 .../test/LogImprovementsASTTransformsTest.groovy   |  2 ++
 src/spec/test/PackageTest.groovy                   |  2 ++
 src/spec/test/PrimitiveTest.groovy                 |  2 ++
 .../test/SaferScriptingASTTransformsTest.groovy    |  2 ++
 src/spec/test/ScriptsAndClassesSpecTest.groovy     |  2 ++
 src/spec/test/SwingASTTransformsTest.groovy        |  2 ++
 src/spec/test/TestingASTTransformsTest.groovy      |  5 +++-
 src/spec/test/TraitsSpecificationTest.groovy       |  3 ++
 src/spec/test/builder/FileTreeBuilderTest.groovy   | 10 ++++---
 src/spec/test/builder/NodeBuilderTest.groovy       |  2 ++
 .../test/builder/ObjectGraphBuilderTest.groovy     |  1 +
 src/spec/test/cli/CliBuilderTestCase.groovy        |  2 ++
 src/spec/test/gdk/ConfigSlurperTest.groovy         |  2 ++
 src/spec/test/gdk/ExpandoTest.groovy               |  2 ++
 src/spec/test/gdk/ObservableTest.groovy            |  2 ++
 .../test/gdk/WorkingWithCollectionsTest.groovy     |  2 ++
 src/spec/test/gdk/WorkingWithIOSpecTest.groovy     |  3 +-
 .../metaprogramming/ASTMatcherFilteringTest.groovy |  1 +
 .../metaprogramming/ASTMatcherTestingTest.groovy   |  1 +
 .../test/metaprogramming/ASTXFormSpecTest.groovy   |  1 +
 src/spec/test/metaprogramming/CategoryTest.groovy  |  1 +
 .../metaprogramming/ExpandoMetaClassTest.groovy    |  2 ++
 .../test/metaprogramming/GroovyObjectTest.groovy   |  2 ++
 .../test/metaprogramming/InterceptableTest.groovy  |  2 ++
 .../InterceptionThroughMetaClassTest.groovy        |  1 +
 .../test/metaprogramming/MacroClassTest.groovy     |  1 +
 .../metaprogramming/MacroExpressionTest.groovy     |  1 +
 .../test/metaprogramming/MacroStatementTest.groovy |  1 +
 .../MacroVariableSubstitutionTest.groovy           |  1 +
 .../MethodPropertyMissingTest.groovy               |  2 ++
 ...taticPropertyMissingAndMethodMissingTest.groovy |  2 ++
 src/spec/test/objectorientation/MethodsTest.groovy |  2 ++
 src/spec/test/semantics/GPathTest.groovy           |  3 +-
 src/spec/test/semantics/LabelsTest.groovy          |  2 ++
 src/spec/test/semantics/PowerAssertTest.groovy     |  1 +
 src/spec/test/semantics/TheGroovyTruthTest.groovy  |  2 ++
 src/spec/test/testingguide/GDKMethodTests.groovy   |  2 ++
 .../testingguide/GroovyTestCaseExampleTests.groovy |  3 +-
 .../test/testingguide/MockingExampleTests.groovy   |  1 +
 src/spec/test/typing/OptionalTypingTest.groovy     |  2 ++
 .../test/typing/StaticCompilationIntroTest.groovy  |  2 ++
 .../typing/TypeCheckingExtensionSpecTest.groovy    |  1 +
 src/tck/test/gls/ch03/s01/Unicode1.groovy          |  4 ++-
 src/tck/test/gls/ch03/s01/Unicode2.groovy          |  4 ++-
 .../test/gls/ch03/s02/LexicalTranslation1.groovy   |  2 ++
 src/tck/test/gls/ch03/s02/Longest1.groovy          |  2 ++
 src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy   |  2 ++
 src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy   |  2 ++
 src/test/gls/CompilableTestSupport.groovy          |  1 +
 .../closures/AnnotationClosureTest.groovy          |  2 +-
 .../AnnotationClosureWithNonLocalVariable.groovy   |  2 ++
 src/test/gls/ch06/s05/GName1Test.groovy            |  1 +
 src/test/gls/closures/ResolveStrategyTest.groovy   |  1 +
 src/test/gls/innerClass/InnerClassTest.groovy      |  2 +-
 src/test/gls/innerClass/InnerInterfaceTest.groovy  |  2 ++
 .../gls/invocation/ClassDuplicationTest.groovy     |  2 ++
 src/test/gls/invocation/DefaultParamTest.groovy    |  1 +
 src/test/gls/scope/VariablePrecedenceTest.groovy   |  2 ++
 src/test/gls/syntax/Gep3OrderDslTest.groovy        |  1 +
 src/test/gls/syntax/Gep3Test.groovy                |  2 ++
 src/test/groovy/ActorTest.groovy                   |  2 ++
 src/test/groovy/AmbiguousInvocationTest.groovy     |  2 ++
 src/test/groovy/ArrayAutoboxingTest.groovy         |  2 ++
 src/test/groovy/ArrayCoerceTest.groovy             |  2 ++
 src/test/groovy/ArrayParamMethodTest.groovy        |  2 ++
 src/test/groovy/ArrayTest.groovy                   |  2 ++
 src/test/groovy/ArrayTypeTest.groovy               |  2 ++
 src/test/groovy/AsTest.groovy                      |  3 ++
 src/test/groovy/AssertNumberTest.groovy            |  2 ++
 src/test/groovy/AssertTest.groovy                  |  2 ++
 src/test/groovy/Base64Test.groovy                  |  2 ++
 src/test/groovy/BinaryStreamsTest.groovy           |  2 ++
 src/test/groovy/BindingTest.groovy                 |  2 ++
 src/test/groovy/BitSetTest.groovy                  |  2 ++
 src/test/groovy/CallInnerClassCtorTest.groovy      |  2 ++
 src/test/groovy/CastTest.groovy                    |  2 ++
 src/test/groovy/CategoryTest.groovy                |  2 ++
 src/test/groovy/ChainedAssignmentTest.groovy       |  2 ++
 src/test/groovy/ClassExpressionTest.groovy         |  2 ++
 src/test/groovy/ClassLoaderBug.groovy              |  2 ++
 src/test/groovy/ClassTest.groovy                   |  2 ++
 src/test/groovy/ClosureAsParamTest.groovy          |  2 ++
 src/test/groovy/ClosureCloneTest.groovy            |  2 ++
 src/test/groovy/ClosureComparatorTest.groovy       |  2 ++
 src/test/groovy/ClosureComposeTest.groovy          |  1 +
 src/test/groovy/ClosureCurryTest.groovy            |  1 +
 src/test/groovy/ClosureDefaultParameterTest.groovy |  2 ++
 src/test/groovy/ClosureInClosureTest.groovy        |  2 ++
 src/test/groovy/ClosureInStaticMethodTest.groovy   |  2 ++
 src/test/groovy/ClosureMethodCallTest.groovy       |  2 ++
 src/test/groovy/ClosureMethodTest.groovy           |  1 +
 src/test/groovy/ClosureMethodsOnFileTest.groovy    |  2 ++
 src/test/groovy/ClosureMissingMethodTest.groovy    |  2 ++
 src/test/groovy/ClosureReturnTest.groovy           |  2 ++
 .../ClosureReturnWithoutReturnStatementTest.groovy |  2 ++
 src/test/groovy/ClosureSugarTest.groovy            |  2 ++
 src/test/groovy/ClosureTest.groovy                 |  1 +
 .../groovy/ClosureUsingOuterVariablesTest.groovy   |  2 ++
 src/test/groovy/ClosureWithDefaultParamTest.groovy |  2 ++
 .../groovy/ClosureWithEmptyParametersTest.groovy   |  2 ++
 src/test/groovy/CollateTest.groovy                 |  2 ++
 src/test/groovy/CompareEqualsTest.groovy           |  2 ++
 src/test/groovy/CompareToTest.groovy               |  2 ++
 src/test/groovy/CompareTypesTest.groovy            |  4 ++-
 src/test/groovy/CompileOrderTest.groovy            |  2 ++
 src/test/groovy/CompilerErrorTest.groovy           |  2 ++
 src/test/groovy/Constructor2Test.groovy            |  2 ++
 src/test/groovy/ConstructorTest.groovy             |  2 ++
 src/test/groovy/CurlyBracketLayoutTest.groovy      |  2 ++
 src/test/groovy/DefaultParamClosureTest.groovy     |  2 ++
 src/test/groovy/DoWhileLoopTest.groovy             |  2 ++
 src/test/groovy/DollarEscapingTest.groovy          |  2 ++
 src/test/groovy/DownUpStepTest.groovy              |  2 ++
 src/test/groovy/DynamicMemberTest.groovy           |  2 ++
 src/test/groovy/EqualsTest.groovy                  |  2 ++
 src/test/groovy/EscapedUnicodeTest.groovy          |  2 ++
 src/test/groovy/ExceptionInClosureTest.groovy      |  2 ++
 src/test/groovy/ExpandoPropertyTest.groovy         |  2 ++
 src/test/groovy/FileTest.groovy                    |  2 ++
 src/test/groovy/FilterLineTest.groovy              |  2 ++
 src/test/groovy/FinallyTest.groovy                 |  2 ++
 .../groovy/ForLoopWithLocalVariablesTest.groovy    |  2 ++
 src/test/groovy/GStringTest.groovy                 |  2 ++
 src/test/groovy/GeneratorTest.groovy               |  2 ++
 src/test/groovy/GlobalPrintlnTest.groovy           |  2 ++
 .../groovy/GroovyCharSequenceMethodsTest.groovy    |  2 ++
 src/test/groovy/GroovyClosureMethodsTest.groovy    |  2 ++
 src/test/groovy/GroovyInterceptableTest.groovy     |  1 +
 src/test/groovy/GroovyMethodsTest.groovy           |  2 ++
 src/test/groovy/GroovyTruthTest.groovy             |  2 ++
 src/test/groovy/HeredocsTest.groovy                |  2 ++
 src/test/groovy/HexTest.groovy                     |  2 ++
 src/test/groovy/HomepageTest.groovy                |  2 ++
 src/test/groovy/IdentityClosureTest.groovy         |  2 ++
 src/test/groovy/IfElseCompactTest.groovy           |  2 ++
 src/test/groovy/IfElseTest.groovy                  |  2 ++
 src/test/groovy/IfPropertyTest.groovy              |  2 ++
 src/test/groovy/IfTest.groovy                      |  2 ++
 src/test/groovy/IfWithMethodCallTest.groovy        |  2 ++
 src/test/groovy/IllegalAccessScenariosTest.groovy  |  2 ++
 src/test/groovy/ImportTest.groovy                  |  2 ++
 src/test/groovy/InstanceofTest.groovy              |  2 ++
 .../groovy/InvokeNormalMethodsFirstTest.groovy     |  2 ++
 src/test/groovy/KeywordsInPropertyNamesTest.groovy |  2 ++
 src/test/groovy/LeftShiftTest.groovy               |  2 ++
 src/test/groovy/ListIteratingTest.groovy           |  2 ++
 src/test/groovy/ListTest.groovy                    |  1 +
 src/test/groovy/LiteralTypesTest.groovy            |  2 ++
 src/test/groovy/LittleClosureTest.groovy           |  2 ++
 src/test/groovy/LocalFieldTest.groovy              |  2 ++
 src/test/groovy/LocalPropertyTest.groovy           |  2 ++
 src/test/groovy/LocalVariableTest.groovy           |  2 ++
 src/test/groovy/LogicTest.groovy                   |  2 ++
 src/test/groovy/LoopBreakTest.groovy               |  2 ++
 src/test/groovy/MapConstructionTest.groovy         |  2 ++
 src/test/groovy/MapPropertyTest.groovy             |  2 ++
 src/test/groovy/MapTest.groovy                     |  2 ++
 src/test/groovy/MethodCallTest.groovy              |  2 ++
 .../groovy/MethodCallWithoutParenthesisTest.groovy |  2 ++
 .../MethodParameterAccessWithinClosureTest.groovy  |  2 ++
 src/test/groovy/MinMaxTest.groovy                  |  2 ++
 src/test/groovy/MinusEqualsTest.groovy             |  2 ++
 src/test/groovy/ModuloTest.groovy                  |  2 ++
 src/test/groovy/MultiCatchTest.groovy              |  1 +
 src/test/groovy/MultiDimArraysTest.groovy          |  2 ++
 .../groovy/MultilineChainExpressionTest.groovy     |  2 ++
 src/test/groovy/MultilineStringTest.groovy         |  2 ++
 src/test/groovy/MultiplyDivideEqualsTest.groovy    |  2 ++
 src/test/groovy/NamedParameterTest.groovy          |  1 +
 src/test/groovy/NestedClassTest.groovy             |  2 ++
 src/test/groovy/NullPropertyTest.groovy            |  2 ++
 src/test/groovy/OptionalReturnTest.groovy          |  2 ++
 src/test/groovy/OverloadInvokeMethodTest.groovy    |  2 ++
 src/test/groovy/OverridePropertyGetterTest.groovy  |  2 ++
 src/test/groovy/OverrideTest.groovy                |  2 ++
 src/test/groovy/PlusEqualsTest.groovy              |  2 ++
 src/test/groovy/PostfixTest.groovy                 |  2 ++
 src/test/groovy/PrefixTest.groovy                  |  2 ++
 src/test/groovy/PrimitiveArraysTest.groovy         |  2 ++
 src/test/groovy/PrimitiveDefaultValueTest.groovy   |  2 ++
 src/test/groovy/PrimitiveTypeFieldTest.groovy      |  2 ++
 src/test/groovy/PrimitiveTypesTest.groovy          |  2 ++
 src/test/groovy/PrintTest.groovy                   |  1 +
 ...ateVariableAccessFromAnotherInstanceTest.groovy |  2 ++
 src/test/groovy/ProcessTest.groovy                 |  2 ++
 src/test/groovy/Property2Test.groovy               |  2 ++
 src/test/groovy/PropertyTest.groovy                |  2 ++
 src/test/groovy/PropertyWithoutDotTest.groovy      |  2 ++
 src/test/groovy/RangeTest.groovy                   |  2 ++
 src/test/groovy/ReadLineTest.groovy                |  2 ++
 src/test/groovy/RegularExpressionsTest.groovy      |  2 ++
 src/test/groovy/ReturnTest.groovy                  |  2 ++
 src/test/groovy/SafeNavigationTest.groovy          |  2 ++
 src/test/groovy/SerializeTest.groovy               |  2 ++
 src/test/groovy/SetTest.groovy                     |  2 ++
 src/test/groovy/ShellTest.groovy                   |  2 ++
 src/test/groovy/SimplePostfixTest.groovy           |  2 ++
 src/test/groovy/SingletonBugTest.groovy            |  3 ++
 src/test/groovy/SliceTest.groovy                   |  2 ++
 src/test/groovy/SocketTest.groovy                  |  2 ++
 src/test/groovy/SortTest.groovy                    |  2 ++
 src/test/groovy/SpreadDotTest.groovy               |  2 ++
 src/test/groovy/SqlDateTest.groovy                 |  3 +-
 src/test/groovy/StackTraceTest.groovy              |  2 ++
 src/test/groovy/StaticMessageTest.groovy           |  2 ++
 src/test/groovy/StringBufferTest.groovy            |  2 ++
 src/test/groovy/StringTest.groovy                  |  2 ++
 src/test/groovy/SubscriptTest.groovy               |  2 ++
 src/test/groovy/SwitchTest.groovy                  |  2 ++
 .../groovy/SwitchWithDifferentTypesTest.groovy     |  2 ++
 src/test/groovy/TextPropertyTest.groovy            |  2 ++
 src/test/groovy/ThisAndSuperTest.groovy            |  2 ++
 src/test/groovy/ThreadMethodsTest.groovy           |  2 ++
 src/test/groovy/ThrowTest.groovy                   |  2 ++
 src/test/groovy/ToArrayBugTest.groovy              |  2 ++
 src/test/groovy/TripleQuotedStringTest.groovy      |  2 ++
 src/test/groovy/TypesafeMethodTest.groovy          |  2 ++
 src/test/groovy/UniqueOnCollectionTest.groovy      |  2 ++
 .../UniqueOnCollectionWithClosureTest.groovy       |  2 ++
 .../UniqueOnCollectionWithComparatorTest.groovy    |  2 ++
 src/test/groovy/UnsafeNavigationTest.groovy        |  2 ++
 src/test/groovy/VArgsTest.groovy                   |  2 ++
 src/test/groovy/ValidNameTest.groovy               |  2 ++
 src/test/groovy/VarargsMethodTest.groovy           |  2 ++
 src/test/groovy/VerbatimGStringTest.groovy         |  2 ++
 src/test/groovy/WhileLoopTest.groovy               |  2 ++
 .../PackageAndImportAnnotationTest.groovy          |  2 +-
 .../annotations/ParameterAnnotationTest.groovy     |  1 +
 src/test/groovy/beans/BindableTransformTest.groovy |  1 +
 .../groovy/beans/ListenerListTransformTest.groovy  |  2 ++
 src/test/groovy/beans/VetoableTransformTest.groovy |  1 +
 .../groovy/bugs/AmbiguousListOrMethodTest.groovy   |  2 ++
 src/test/groovy/bugs/AsBoolBug.groovy              |  2 ++
 .../bugs/AssignmentInsideExpressionBug.groovy      |  2 ++
 .../groovy/bugs/AttributeSetExpressionBug.groovy   |  2 ++
 .../groovy/bugs/AutoboxingOfComparisonsBug.groovy  |  2 ++
 .../bugs/BadLineNumberOnExceptionBugTest.groovy    |  6 ++--
 src/test/groovy/bugs/BadScriptNameBug.groovy       |  2 ++
 src/test/groovy/bugs/BenchmarkBug.groovy           |  2 ++
 src/test/groovy/bugs/BlockAsClosureBug.groovy      |  2 ++
 src/test/groovy/bugs/BooleanBug.groovy             |  2 ++
 src/test/groovy/bugs/ByteIndexBug.groovy           |  2 ++
 src/test/groovy/bugs/Bytecode2Bug.groovy           |  2 ++
 src/test/groovy/bugs/Bytecode3Bug.groovy           |  2 ++
 src/test/groovy/bugs/Bytecode4Bug.groovy           |  2 ++
 src/test/groovy/bugs/Bytecode5Bug.groovy           |  2 ++
 src/test/groovy/bugs/Bytecode6Bug.groovy           |  2 ++
 src/test/groovy/bugs/Bytecode7Bug.groovy           |  2 ++
 src/test/groovy/bugs/BytecodeBug.groovy            |  2 ++
 .../bugs/CallingClosuresWithClosuresBug.groovy     |  2 ++
 .../groovy/bugs/CastWhenUsingClosuresBug.groovy    |  2 ++
 src/test/groovy/bugs/ChristofsPropertyBug.groovy   |  2 ++
 .../groovy/bugs/ClassGeneratorFixesTest.groovy     |  2 ++
 src/test/groovy/bugs/ClassInNamedParamsBug.groovy  |  2 ++
 src/test/groovy/bugs/ClosureInClosureBug.groovy    |  2 ++
 .../groovy/bugs/ClosureTypedVariableBug.groovy     |  2 ++
 src/test/groovy/bugs/ClosureVariableBug.groovy     |  2 ++
 .../bugs/ClosureWithBitwiseDefaultParamTest.groovy |  2 ++
 src/test/groovy/bugs/ConstructorBug.groovy         |  1 +
 src/test/groovy/bugs/CustomMetaClassTest.groovy    |  2 ++
 src/test/groovy/bugs/DefVariableBug.groovy         |  2 ++
 .../bugs/DirectMethodCallWithVargsTest.groovy      |  1 +
 src/test/groovy/bugs/ForLoopBug.groovy             |  2 ++
 src/test/groovy/bugs/FullyQualifiedClassBug.groovy |  2 ++
 .../bugs/FullyQualifiedMethodReturnTypeBug.groovy  |  2 ++
 .../bugs/FullyQualifiedVariableTypeBug.groovy      |  2 ++
 src/test/groovy/bugs/GetterBug.groovy              |  2 ++
 src/test/groovy/bugs/Groovy1018_Bug.groovy         |  4 ++-
 src/test/groovy/bugs/Groovy1059_Bug.groovy         |  2 ++
 src/test/groovy/bugs/Groovy1081_Bug.groovy         |  2 ++
 src/test/groovy/bugs/Groovy1407_Bug.groovy         |  2 ++
 src/test/groovy/bugs/Groovy1462_Bug.groovy         |  2 ++
 src/test/groovy/bugs/Groovy1465Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy1593.groovy             |  2 ++
 src/test/groovy/bugs/Groovy1617_Bug.groovy         |  2 ++
 src/test/groovy/bugs/Groovy1706_Bug.groovy         |  2 ++
 src/test/groovy/bugs/Groovy2271Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy2339Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2348Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2350Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2351Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2391Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy239_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2432Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2490Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy252_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2549Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2556Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2557Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2558Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2666Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy2773Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy278_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2801Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2816Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2849Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy2949Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3069Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy308_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3135Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3139Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy3156And2621Bug.groovy   |  2 ++
 src/test/groovy/bugs/Groovy3163Bug.groovy          | 32 ++++++++++------------
 src/test/groovy/bugs/Groovy3175_Bug.groovy         |  2 ++
 src/test/groovy/bugs/Groovy3205Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3208Bug.groovy          |  4 ++-
 src/test/groovy/bugs/Groovy3235Bug.groovy          |  4 ++-
 src/test/groovy/bugs/Groovy3238Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy325_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3304Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy3305Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3335Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3339Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3383Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3389Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3403Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy3405Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3410Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3424Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3426Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3446Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3462Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3464Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy3465Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3498Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3509Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3511Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy3519Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3560Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3574Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3590Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3645Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3658Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3679Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3716Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy3718Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3720Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy3723Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3726Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3749Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3770Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3776Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3784Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3789Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3799Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3801Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3818Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3827Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy3830Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3831Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3834Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3839Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3863Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3868Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3871Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3873Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3876Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy3894Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy389_Bug.groovy          |  3 +-
 src/test/groovy/bugs/Groovy3904Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy3948Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy3949Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4006Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4009Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4018Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4029Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4035Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4038Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4046Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4069Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4075Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4078Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4080Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4098Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4104Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4106Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4107Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4111Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4116Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4119Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4120Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4121Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4129Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4131Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4133Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4134Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4139Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4170Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4188Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4191Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4193Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4202Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4206Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4235Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4241Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4243Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4246Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4247Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4252Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4257Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4264Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4272Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4273Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4287Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4293Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4386_Bug.groovy         |  1 +
 src/test/groovy/bugs/Groovy4393Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4410Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4414Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4415Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4416Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4435Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy4449Bug.groovy          |  1 +
 ...Groovy4457GenericTypeDeclarationLeakTest.groovy |  2 ++
 src/test/groovy/bugs/Groovy4471Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4480Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4497Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4516Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4584Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4720Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4857Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4861Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4922Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4958Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4966Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4967Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4973Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4980Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4986Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4989Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy4999Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5025Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5030Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5033Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5056Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5061.groovy             |  1 +
 src/test/groovy/bugs/Groovy5101Test.groovy         |  2 ++
 src/test/groovy/bugs/Groovy5109Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5122Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5137Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy513_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5150Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy5152Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5185Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5193Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy5210Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5212Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy5260Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy5272Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5285Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5396Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5418Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5425_Bug.groovy         |  2 ++
 src/test/groovy/bugs/Groovy5572Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy558_616_Bug.groovy      |  2 ++
 src/test/groovy/bugs/Groovy5687Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5783Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5802Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy5806Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5852Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy5915Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy6042Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6045Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6072Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6086Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy6271Bug.groovy          |  2 +-
 src/test/groovy/bugs/Groovy6374Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6396Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6508Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6522Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy662Bug.groovy           |  2 ++
 src/test/groovy/bugs/Groovy666_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6722Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy674_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6755Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy675_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6764Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6786Bug.groovy          |  2 +-
 src/test/groovy/bugs/Groovy6804Bug.groovy          |  2 +-
 src/test/groovy/bugs/Groovy6808Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6811Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6821Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6830Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6841Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6862Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy6932Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7031Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7081Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7204Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7248Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7291Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7520Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7584Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7691Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7709Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy770_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7721Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy7753Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7797Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy779_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7812Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy7876Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7912Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7916Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7917Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7920Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7921Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7924Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7933Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7937Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7938Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7951Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy7958Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7969Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7970Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7985Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7994Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7995Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy7996Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8026Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8030Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8048Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8055Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8059Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8060Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8065Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8084Bug.groovy          |  2 +-
 src/test/groovy/bugs/Groovy8085Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8110Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8138Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8140Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8176Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8212Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8229Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8260Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8313Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy831_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8327Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8337Bug.groovy          |  2 +-
 src/test/groovy/bugs/Groovy8339Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8383Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8389Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8409Bug.groovy          |  2 +-
 src/test/groovy/bugs/Groovy8439Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8474Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8523Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8600Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8609Bug.groovy          |  1 +
 src/test/groovy/bugs/Groovy8629Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy872Bug.groovy           |  2 ++
 src/test/groovy/bugs/Groovy8764Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8816Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8819Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8833Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8864Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8868Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8881Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy8887.groovy             |  2 ++
 src/test/groovy/bugs/Groovy8962.groovy             |  1 +
 src/test/groovy/bugs/Groovy9074.groovy             |  1 +
 src/test/groovy/bugs/Groovy965_Bug.groovy          |  2 ++
 src/test/groovy/bugs/Groovy996_Bug.groovy          |  2 ++
 src/test/groovy/bugs/GroovyInnerEnumBug.groovy     |  2 ++
 src/test/groovy/bugs/GuillaumesBug.groovy          |  2 ++
 src/test/groovy/bugs/GuillaumesMapBug.groovy       |  2 ++
 .../groovy/bugs/ImportNodeLineNumberTest.groovy    |  2 ++
 .../groovy/bugs/InconsistentStackHeightBug.groovy  |  2 ++
 src/test/groovy/bugs/InterfaceImplBug.groovy       |  1 +
 ...vokeNormalMethodFromBuilder_Groovy657Bug.groovy |  2 ++
 src/test/groovy/bugs/MarkupAndMethodBug.groovy     |  2 ++
 src/test/groovy/bugs/MetaClassCachingBug.groovy    |  2 ++
 ...MethodCallWithoutParensInStaticMethodBug.groovy |  2 ++
 src/test/groovy/bugs/MethodClosureTest.groovy      |  1 +
 src/test/groovy/bugs/MethodDispatchBug.groovy      |  2 ++
 src/test/groovy/bugs/MethodPointerBug.groovy       |  2 ++
 src/test/groovy/bugs/MorgansBug.groovy             |  2 ++
 src/test/groovy/bugs/NestedClosureBug.groovy       |  2 ++
 .../groovy/bugs/NullAsBooleanCoercionTest.groovy   |  2 ++
 src/test/groovy/bugs/NullCompareBug.groovy         |  2 ++
 .../groovy/bugs/OverloadInvokeMethodBug.groovy     |  2 ++
 src/test/groovy/bugs/POJOCallSiteBug.groovy        |  2 ++
 src/test/groovy/bugs/PrimitivePropertyBug.groovy   |  2 ++
 src/test/groovy/bugs/PrintlnWithNewBug.groovy      |  1 +
 src/test/groovy/bugs/PropertyNameBug.groovy        |  2 ++
 src/test/groovy/bugs/RodsBooleanBug.groovy         |  2 ++
 src/test/groovy/bugs/RodsBug.groovy                |  2 ++
 .../groovy/bugs/RussellsOptionalParenTest.groovy   |  2 ++
 src/test/groovy/bugs/SingleEvalTest.groovy         |  2 ++
 .../groovy/bugs/StaticClosurePropertyBug.groovy    |  2 ++
 src/test/groovy/bugs/StaticMethodCallBug.groovy    |  2 ++
 src/test/groovy/bugs/StaticMethodImportBug.groovy  |  3 +-
 .../bugs/StaticMethodImportGroovy935Bug.groovy     |  3 +-
 src/test/groovy/bugs/StaticPropertyBug.groovy      |  2 ++
 .../groovy/bugs/SubscriptAndExpressionBug.groovy   |  2 ++
 src/test/groovy/bugs/SuperMethod2Bug.groovy        |  3 +-
 src/test/groovy/bugs/SuperMethodBug.groovy         |  2 ++
 .../groovy/bugs/SynchronizedBytecodeBug.groovy     |  2 ++
 src/test/groovy/bugs/TernaryOperatorTest.groovy    |  2 ++
 src/test/groovy/bugs/ToStringBug.groovy            |  2 ++
 src/test/groovy/bugs/TryCatch2Bug.groovy           |  2 ++
 src/test/groovy/bugs/TryCatchBug.groovy            |  2 ++
 src/test/groovy/bugs/UnknownVariableBug.groovy     |  2 ++
 src/test/groovy/bugs/UseClosureInClosureBug.groovy |  2 ++
 src/test/groovy/bugs/UseStaticInClosureBug.groovy  |  2 ++
 src/test/groovy/bugs/VariablePrecedence.groovy     |  2 ++
 src/test/groovy/bugs/VariablePrecedenceTest.groovy |  2 ++
 src/test/groovy/bugs/VerifyErrorBug.groovy         |  2 ++
 src/test/groovy/bugs/WriteOnlyPropertyBug.groovy   |  2 ++
 src/test/groovy/bugs/ZoharsBug.groovy              |  2 ++
 .../bugs/groovy5912/otherpkg/Groovy5912Bug.groovy  |  2 ++
 .../groovy/bugs/groovy6938/Groovy6938Bug.groovy    |  2 ++
 .../groovy/bugs/groovy8531/Groovy8531Bug.groovy    |  2 ++
 src/test/groovy/bugs/groovy8757/UsageTest.groovy   |  2 ++
 .../SyntheticParameterAnnotationsBug.groovy        |  2 ++
 .../groovy/bugs/groovy9236/Groovy9236Bug.groovy    |  1 +
 src/test/groovy/execute/ExecuteTest.groovy         |  2 ++
 .../groovy/execute/ExecuteTest_LinuxSolaris.groovy |  1 +
 src/test/groovy/execute/ExecuteTest_Windows.groovy |  1 +
 src/test/groovy/gpath/GPathTest.groovy             |  2 ++
 src/test/groovy/gpath/NodeGPathTest.groovy         |  2 ++
 .../groovy/grape/GrabErrorIsolationTest.groovy     |  2 ++
 src/test/groovy/grape/GrabExcludeTest.groovy       |  1 +
 src/test/groovy/grape/GrabResolverTest.groovy      |  1 +
 src/test/groovy/grape/GrapeClassLoaderTest.groovy  |  3 ++
 src/test/groovy/io/LineColumnReaderTest.groovy     |  2 ++
 .../groovy/lang/BenchmarkInterceptorTest.groovy    |  2 ++
 src/test/groovy/lang/CategoryAnnotationTest.groovy |  2 ++
 src/test/groovy/lang/ClassReloadingTest.groovy     |  1 +
 src/test/groovy/lang/ClosureResolvingTest.groovy   |  2 ++
 .../groovy/lang/DelegatingMetaClassTest.groovy     |  2 ++
 src/test/groovy/lang/ExceptionTest.groovy          |  2 ++
 .../lang/ExpandoMetaClassConstructorTest.groovy    |  2 ++
 .../lang/ExpandoMetaClassCreationHandleTest.groovy |  4 ++-
 src/test/groovy/lang/ExpandoMetaClassTest.groovy   |  2 ++
 src/test/groovy/lang/GetMethodsTest.groovy         |  2 ++
 src/test/groovy/lang/GroovyClassLoaderTest.groovy  |  3 +-
 src/test/groovy/lang/GroovyCodeSourceTest.groovy   |  2 ++
 src/test/groovy/lang/GroovyShellTest2.groovy       |  2 ++
 src/test/groovy/lang/GroovySystemTest.groovy       |  2 ++
 .../groovy/lang/InnerClassResolvingTest.groovy     |  2 ++
 src/test/groovy/lang/IntRangeTest.groovy           |  4 ++-
 src/test/groovy/lang/InterceptorTest.groovy        |  1 +
 src/test/groovy/lang/MapOfClosureTest.groovy       |  2 ++
 src/test/groovy/lang/MetaClassPropertyTest.groovy  |  2 ++
 src/test/groovy/lang/MetaClassRegistryTest.groovy  |  2 ++
 src/test/groovy/lang/MethodMissingTest.groovy      |  2 ++
 src/test/groovy/lang/MixinAnnotationTest.groovy    |  5 ++--
 src/test/groovy/lang/MixinTest.groovy              |  2 ++
 src/test/groovy/lang/PropertyMissingTest.groovy    |  2 ++
 .../groovy/lang/ReferenceSerializationTest.groovy  |  2 ++
 src/test/groovy/lang/RespondsToTest.groovy         |  2 ++
 src/test/groovy/lang/ScriptCacheTest.groovy        |  2 ++
 .../lang/ScriptSourcePositionInAstTest.groovy      |  1 +
 src/test/groovy/lang/StringConcatTest.groovy       |  2 ++
 src/test/groovy/lang/StripMarginTest.groovy        |  2 ++
 src/test/groovy/lang/SyntheticReturnTest.groovy    |  2 ++
 src/test/groovy/lang/TapMethodTest.groovy          |  2 ++
 src/test/groovy/lang/WithMethodTest.groovy         |  2 ++
 .../groovy/mock/example/SandwichMakerTest.groovy   |  1 +
 .../groovy/mock/interceptor/HalfMockTest.groovy    |  2 ++
 .../mock/interceptor/MockCallSequenceTest.groovy   |  1 +
 .../groovy/mock/interceptor/MockForJavaTest.groovy |  2 ++
 .../mock/interceptor/MockNestedCallTest.groovy     |  2 ++
 .../mock/interceptor/MockSingleCallTest.groovy     |  1 +
 .../mock/interceptor/MockWithZeroRangeTest.groovy  |  1 +
 .../mock/interceptor/StubCallSequenceTest.groovy   |  1 +
 .../groovy/mock/interceptor/StubForJavaTest.groovy |  2 ++
 .../mock/interceptor/StubSingleCallTest.groovy     |  2 ++
 src/test/groovy/mock/interceptor/StubTest.groovy   |  2 ++
 .../groovy/operator/BigDecimalOperatorsTest.groovy |  2 ++
 .../operator/BigIntegerOperationsTest.groovy       |  2 ++
 .../groovy/operator/BitwiseOperatorsTest.groovy    |  2 ++
 .../groovy/operator/BooleanOperationsTest.groovy   |  2 ++
 .../groovy/operator/DoubleOperationTest.groovy     |  2 ++
 .../groovy/operator/IntegerOperatorsTest.groovy    |  2 ++
 .../operator/MyColorOperatorOverloadingTest.groovy |  2 ++
 src/test/groovy/operator/NegateListsTest.groovy    |  2 ++
 src/test/groovy/operator/PowerOperatorsTest.groovy |  2 ++
 .../groovy/operator/SpreadListOperatorTest.groovy  |  2 ++
 .../groovy/operator/SpreadMapOperatorTest.groovy   |  2 ++
 .../groovy/operator/StringOperatorsTest.groovy     |  2 ++
 .../groovy/operator/TernaryOperatorsTest.groovy    |  2 ++
 .../groovy/operator/UnaryMinusNumberTests.groovy   |  2 ++
 .../groovy/operator/UnaryMinusOperatorTest.groovy  |  2 ++
 .../script/StreamClassloaderInScriptTest.groovy    |  2 ++
 src/test/groovy/time/DurationTest.groovy           |  2 ++
 src/test/groovy/time/TimeCategoryTest.groovy       |  2 ++
 .../transform/AnnotationCollectorLegacyTest.groovy |  1 +
 .../transform/AnnotationCollectorTest.groovy       |  1 +
 .../transform/ConditionalInterruptTest.groovy      |  2 ++
 src/test/groovy/transform/LazyTest.groovy          |  2 ++
 src/test/groovy/transform/ReadWriteLockTest.groovy |  2 ++
 .../groovy/transform/TimedInterruptTest.groovy     |  1 +
 .../stc/ArraysAndCollectionsSTCTest.groovy         |  4 +--
 .../groovy/transform/stc/GenericsSTCTest.groovy    |  2 +-
 src/test/groovy/transform/stc/Groovy7888Bug.groovy |  2 ++
 src/test/groovy/transform/stc/LambdaTest.groovy    |  2 ++
 .../transform/stc/MethodReferenceTest.groovy       |  2 ++
 .../stc/StaticTypeCheckingTestCase.groovy          |  1 +
 .../transform/stc/WithSTCStandaloneTest.groovy     |  2 ++
 src/test/groovy/tree/ClosureClassLoaderBug.groovy  |  2 ++
 src/test/groovy/tree/NavigationNodeTest.groovy     |  4 +--
 src/test/groovy/tree/NestedClosureBugTest.groovy   |  2 ++
 src/test/groovy/tree/SmallTreeTest.groovy          |  2 ++
 src/test/groovy/tree/TreeTest.groovy               |  2 ++
 src/test/groovy/tree/VerboseTreeTest.groovy        |  2 ++
 src/test/groovy/txn/TransactionTest.groovy         |  2 ++
 src/test/groovy/ui/GroovyMainTest.groovy           |  2 ++
 src/test/groovy/util/BufferedIteratorTest.groovy   |  1 +
 src/test/groovy/util/BuilderSupportTest.groovy     |  2 ++
 src/test/groovy/util/ConfigObjectTest.groovy       |  2 ++
 src/test/groovy/util/ConfigSlurperTest.groovy      |  3 ++
 src/test/groovy/util/DelegatingScriptTest.groovy   |  1 +
 .../groovy/util/FactoryBuilderSupportTest.groovy   |  2 ++
 src/test/groovy/util/FileTreeBuilderTest.groovy    |  2 ++
 .../util/GroovyCollectionsStarImportTest.groovy    |  2 ++
 src/test/groovy/util/GroovyCollectionsTest.groovy  |  2 ++
 .../util/GroovyScriptEngineReloadingTest.groovy    |  2 ++
 src/test/groovy/util/GroovyScriptEngineTest.groovy |  1 +
 src/test/groovy/util/IndentPrinterTest.groovy      |  2 ++
 src/test/groovy/util/NodeTest.groovy               |  1 +
 src/test/groovy/util/ObjectGraphBuilderTest.groovy |  2 ++
 src/test/groovy/util/ObservableListTest.groovy     |  2 ++
 src/test/groovy/util/ObservableMapTest.groovy      |  2 ++
 src/test/groovy/util/ObservableSetTests.groovy     |  2 ++
 src/test/groovy/util/OrderByTest.groovy            |  1 +
 .../groovy/util/ProxyGeneratorAdapterTest.groovy   |  1 +
 src/test/groovy/util/ProxyGeneratorTest.groovy     |  2 ++
 src/test/groovy/util/ProxyTest.groovy              |  2 ++
 src/test/groovy/util/ResourceBundleTest.groovy     |  4 ++-
 src/test/groovy/util/logging/CommonsTest.groovy    |  2 ++
 src/test/groovy/util/logging/Log4j2Test.groovy     |  2 ++
 src/test/groovy/util/logging/Log4jTest.groovy      |  2 ++
 src/test/groovy/util/logging/LogTest.groovy        |  2 ++
 src/test/groovy/util/logging/Slf4jTest.groovy      |  1 +
 .../groovy/plugin/GroovyRunnerRegistryTest.groovy  |  2 ++
 .../ClosureAndInnerClassNodeStructureTest.groovy   |  1 +
 .../groovy/antlr/AntlrParserPluginTest.groovy      |  1 +
 .../codehaus/groovy/antlr/GStringEndTest.groovy    |  1 +
 .../groovy/ast/CodeVisitorSupportTest.groovy       |  1 +
 .../codehaus/groovy/ast/GenericsTestCase.groovy    |  1 +
 .../groovy/ast/LazyInitOnClassNodeTest.groovy      |  1 +
 .../ast/builder/AstBuilderFromCodeTest.groovy      |  1 +
 .../builder/AstBuilderFromSpecificationTest.groovy |  1 +
 .../ast/builder/AstBuilderFromStringTest.groovy    |  1 +
 .../AstBuilderFromCodePackageImportTest.groovy     |  1 +
 .../groovy/ast/expr/ClosureExpressionTest.groovy   |  1 +
 .../groovy/ast/expr/MapExpressionTest.groovy       |  1 +
 .../ast/expr/MethodCallExpressionTest.groovy       |  2 ++
 .../groovy/ast/expr/PropertyExpressionTest.groovy  |  2 ++
 .../groovy/ast/source/SourceBaseTestCase.groovy    |  1 +
 .../groovy/ast/stmt/ExpressionStatementTest.groovy |  1 +
 .../groovy/ast/stmt/ThrowStatementTest.groovy      |  1 +
 .../groovy/ast/tools/GenericsUtilsTest.groovy      |  1 +
 .../groovy/classgen/BytecodeHelperTest.groovy      |  1 +
 .../classgen/CallClosureFieldAsMethodTest.groovy   |  2 ++
 .../codehaus/groovy/classgen/CallSiteTest.groovy   |  2 ++
 .../org/codehaus/groovy/classgen/CastTest.groovy   |  2 ++
 .../groovy/classgen/CastToStringTest.groovy        |  2 ++
 .../classgen/FinalVariableAnalyzerTest.groovy      |  1 +
 .../groovy/classgen/GenericsGenTest.groovy         |  1 +
 .../codehaus/groovy/classgen/InterfaceTest.groovy  |  1 +
 .../codehaus/groovy/classgen/MetaClassTest.groovy  |  2 ++
 .../groovy/classgen/ReflectorLoaderTest.groovy     |  2 ++
 .../classgen/asm/AbstractBytecodeTestCase.groovy   |  1 +
 .../asm/InstructionSequenceHelperClassTest.groovy  |  2 ++
 .../classgen/asm/sc/BugsStaticCompileTest.groovy   |  2 +-
 .../classgen/asm/sc/bugs/Groovy6670Bug.groovy      |  2 ++
 .../classgen/asm/sc/bugs/Groovy7870Bug.groovy      | 12 ++++----
 .../classgen/asm/sc/bugs/Groovy7883Bug.groovy      |  2 ++
 .../ASTTransformationCustomizerTest.groovy         |  1 +
 .../customizers/ImportCustomizerTest.groovy        |  1 +
 .../customizers/SecureASTCustomizerTest.groovy     |  1 +
 .../CompilerCustomizationBuilderTest.groovy        |  1 +
 .../groovy/control/io/FileReaderTest.groovy        |  1 +
 .../groovy/control/io/NullWriterTest.groovy        |  2 ++
 .../control/io/StringReaderSourceTest.groovy       |  1 +
 .../groovy/reflection/CachedMethodTest.groovy      |  2 ++
 .../reflection/GroovyClassValueFactoryTest.groovy  |  2 ++
 .../reflection/utils/ReflectionUtilsTest.groovy    |  1 +
 .../groovy/runtime/AppendableDgmMethodsTest.groovy |  2 ++
 .../groovy/runtime/CategoryForIteratorTest.groovy  |  2 ++
 .../runtime/CustomBooleanCoercionTest.groovy       |  2 ++
 .../runtime/DefaultGroovyMethodsSupportTest.groovy |  2 ++
 .../groovy/runtime/DefaultGroovyMethodsTest.groovy |  3 ++
 .../runtime/DefaultGroovyStaticMethodsTest.groovy  |  3 ++
 .../groovy/runtime/DirectoryDeleteTest.groovy      |  4 ++-
 .../codehaus/groovy/runtime/EachLineTest.groovy    |  4 ++-
 .../EachWithReaderAndInputStreamTest.groovy        |  2 ++
 .../codehaus/groovy/runtime/FileAppendTest.groovy  |  2 ++
 .../groovy/runtime/FileLeftShiftTest.groovy        |  2 ++
 .../runtime/FileStaticGroovyMethodsTest.groovy     |  2 ++
 .../groovy/runtime/GroovyCategoryTest.groovy       |  2 ++
 .../groovy/runtime/IOGroovyMethodsTest.groovy      |  1 +
 .../groovy/runtime/InterfaceConversionTest.groovy  |  2 ++
 .../runtime/InvokerHelperFormattingTest.groovy     |  2 ++
 .../org/codehaus/groovy/runtime/MinusTest.groovy   |  2 ++
 .../groovy/runtime/NestedCategoryTest.groovy       |  2 ++
 .../codehaus/groovy/runtime/NullObjectTest.groovy  |  2 ++
 .../groovy/runtime/PerInstanceMetaClassTest.groovy |  2 ++
 .../groovy/runtime/StringAsClassTest.groovy        |  2 ++
 .../codehaus/groovy/runtime/URLGetBytesTest.groovy |  2 ++
 .../codehaus/groovy/runtime/URLGetTextTest.groovy  |  2 ++
 .../runtime/WithResourceStreamClosedTest.groovy    |  4 ++-
 .../groovy/runtime/WriterAppendTest.groovy         |  2 ++
 .../m12n/ExtensionModuleHelperForTests.groovy      |  3 +-
 .../groovy/runtime/m12n/ExtensionModuleTest.groovy |  2 ++
 .../runtime/memoize/AbstractMemoizeTestCase.groovy |  2 ++
 .../CacheCleanupCollectedSoftReferencesTest.groovy |  1 +
 .../groovy/runtime/memoize/CacheCleanupTest.groovy |  2 ++
 .../memoize/LRUProtectionStorageTest.groovy        |  2 ++
 .../StaticMethodOverloadCompileStaticTest.groovy   |  1 +
 .../vm8/StaticMethodOverloadTest.groovy            |  2 ++
 .../powerassert/AssertionRenderingTest.groovy      |  2 ++
 .../AssertionsInDifferentLocationsTest.groovy      |  2 ++
 .../runtime/powerassert/EvaluationTest.groovy      |  2 ++
 .../ImplicitClosureCallRenderingTest.groovy        |  2 ++
 .../NotTransformedAssertionsTest.groovy            |  2 ++
 .../PowerAssertASTTransformationTest.groovy        |  2 ++
 .../runtime/powerassert/ValueRenderingTest.groovy  |  2 ++
 .../runtime/trampoline/TrampolineTest.groovy       |  2 ++
 .../DefaultTypeTransformationTest.groovy           |  2 ++
 .../runtime/typehandling/EqualityTest.groovy       |  2 ++
 .../runtime/typehandling/NumberMathTest.groovy     |  2 ++
 .../typehandling/ShortTypeHandlingTest.groovy      |  2 ++
 .../groovy/tools/LoaderConfigurationTest.groovy    |  2 ++
 .../codehaus/groovy/tools/StringHelperTest.groovy  |  2 ++
 .../org/codehaus/groovy/tools/UtilitiesTest.groovy |  2 ++
 .../tools/ast/TransformTestHelperTest.groovy       |  1 +
 .../rootloadersync/SubclassingInGroovyTest.groovy  |  2 ++
 .../groovy/tools/stubgenerator/StubTestCase.groovy |  1 +
 .../groovy/transform/AutoCloneTransformTest.groovy |  2 ++
 .../transform/AutoImplementTransformTest.groovy    |  2 ++
 .../CanonicalComponentsTransformTest.groovy        |  1 +
 .../groovy/transform/CanonicalTransformTest.groovy |  2 ++
 .../EqualsAndHashCodeTransformTest.groovy          |  2 ++
 .../ExternalizeMethodsTransformTest.groovy         |  2 ++
 .../ExternalizeVerifierTransformTest.groovy        |  2 ++
 .../transform/GeneratedAnnotationTest.groovy       |  1 +
 .../groovy/transform/GlobalTransformTest.groovy    |  2 ++
 .../groovy/transform/ImmutableTransformTest.groovy |  1 +
 .../transform/IndexedPropertyTransformTest.groovy  |  2 ++
 .../InheritConstructorsTransformTest.groovy        |  2 ++
 .../groovy/transform/LazyTransformTest.groovy      |  2 ++
 .../groovy/transform/LocalASTTransformTest.groovy  |  1 +
 .../transform/MapConstructorTransformTest.groovy   |  2 ++
 .../transform/MemoizedASTTransformationTest.groovy |  1 +
 .../transform/NamedVariantTransformTest.groovy     |  2 ++
 .../groovy/transform/NewifyTransformTest.groovy    |  2 ++
 .../transform/ReadWriteLockTransformTest.groovy    |  2 ++
 .../groovy/transform/SingletonTransformTest.groovy |  1 +
 .../transform/SynchronizedTransformTest.groovy     |  1 +
 .../groovy/transform/ToStringTransformTest.groovy  |  2 ++
 .../transform/TupleConstructorTransformTest.groovy |  2 ++
 .../TransformsAndCustomClassLoadersTest.groovy     |  1 +
 .../packageScope/DifferentPackageTest.groovy       |  2 +-
 .../groovy/transform/stc/SignatureCodecTest.groovy |  2 ++
 .../TailRecursiveCompilationFailuresTest.groovy    |  1 +
 .../TailRecursiveTogetherWithOtherASTsTest.groovy  |  2 ++
 .../tailrec/TailRecursiveTransformationTest.groovy |  2 ++
 .../groovy/transform/traitx/Groovy6697Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy6736Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy6741Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7011Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7190Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7196Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7206Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7213Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7214Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7217Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7255Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7269Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7275Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7285Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7456Bug.groovy   |  2 ++
 .../groovy/transform/traitx/Groovy7846Bug.groovy   |  1 +
 .../codehaus/groovy/util/ListHashMapTest.groovy    |  2 ++
 .../util/ManagedConcurrentLinkedQueueTest.groovy   |  2 ++
 .../groovy/util/ManagedConcurrentMapTest.groovy    |  2 ++
 .../util/ManagedConcurrentValueMapTest.groovy      |  2 ++
 .../groovy/util/ManagedLinkedlistTest.groovy       |  4 ++-
 .../groovy/util/ReferenceManagerTest.groovy        |  2 ++
 .../v8/InterfaceStaticMethodCallTest.groovy        |  2 ++
 .../groovy/tools/groovydoc/GroovyDocToolTest.java  |  4 +--
 .../groovy/text/MarkupTemplateEngineTest.groovy    |  2 +-
 .../groovy/test/GroovyLogTestCaseTest.groovy       |  4 +--
 subprojects/groovy-xml/build.gradle                |  2 +-
 .../src/main/java/groovy/xml/XmlParser.java        |  1 +
 .../src/main/java/groovy/xml/XmlSlurper.java       |  2 ++
 .../groovy/xml/slurpersupport/GPathResult.java     |  6 ++--
 .../spec/test/UserGuideMarkupBuilderTest.groovy    |  2 +-
 .../groovy/parser/antlr4/GroovyParserTest.groovy   |  1 +
 .../groovy/parser/antlr4/SyntaxErrorTest.groovy    |  1 +
 .../groovy/runtime/GroovyCategoryStressTest.groovy |  1 +
 .../groovy/groovy/bugs/vm8/Groovy8579Bug.groovy    |  2 ++
 915 files changed, 1707 insertions(+), 89 deletions(-)

diff --git a/config/codenarc/codenarc.groovy b/config/codenarc/codenarc.groovy
index e9c7179..7507e11 100644
--- a/config/codenarc/codenarc.groovy
+++ b/config/codenarc/codenarc.groovy
@@ -109,7 +109,7 @@ ruleset {
         'UnusedVariable' {
             doNotApplyToClassNames = 'SourceBaseTestCase,SAXTest,groovy.ForLoopTest,groovy.bugs.Groovy3894Bug,' +
                 'ExpandoMetaClassTest,ExceptionTest,JSR223Test,' +
-                'groovy.util.GroovyShellTestCase,org.codehaus.groovy.tools.shell.ShellRunner,' +
+                'groovy.test.GroovyShellTestCase,org.codehaus.groovy.tools.shell.ShellRunner,' +
                 'groovy.bugs.Bytecode7Bug,groovy.mock.interceptor.HalfMockTest,' +
                 'groovy.mock.interceptor.MockSingleCallTest,groovy.mock.interceptor.StubSingleCallTest,' +
                 'groovy.operator.TernaryOperatorsTest,groovy.swing.SwingBuilderTableTest,' +
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 9b966a8..627b080 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -164,9 +164,9 @@ task docGDK {
                     arg(value: 'subprojects/groovy-datetime/src/main/java/org/apache/groovy/datetime/extensions/DateTimeStaticExtensions.java')
                     arg(value: 'subprojects/groovy-jaxb/src/main/groovy/org/apache/groovy/jaxb/extensions/JaxbExtensions.java')
                     arg(value: 'subprojects/groovy-sql/src/main/java/org/apache/groovy/sql/extensions/SqlExtensions.java')
-                    arg(value: 'subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java')
-                    arg(value: 'subprojects/groovy-xml/src/main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java')
-                    arg(value: 'subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java')
+                    arg(value: 'subprojects/groovy-swing/src/main/java/org/apache/groovy/swing/extensions/SwingExtensions.java')
+                    arg(value: 'subprojects/groovy-xml/src/main/java/org/apache/groovy/xml/extensions/XmlExtensions.java')
+                    arg(value: 'subprojects/groovy-nio/src/main/java/org/apache/groovy/nio/extensions/NioExtensions.java')
                     arg(value: 'subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java')
                     arg(value: 'subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptStaticExtensions.java')
                 }
diff --git a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 2a1e515..dcdc945 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -212,8 +212,8 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
 //            DateTimeExtensions.class,
 //            SqlExtensions.class,
 //            SwingGroovyMethods.class,
-//            XmlGroovyMethods.class,
-//            NioGroovyMethods.class
+//            XmlExtensions.class,
+//            NioExtensions.class
     };
     private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
     private static final NumberAwareComparator<Comparable> COMPARABLE_NUMBER_AWARE_COMPARATOR = new NumberAwareComparator<Comparable>();
diff --git a/src/spec/doc/core-metaprogramming.adoc b/src/spec/doc/core-metaprogramming.adoc
index 331d20f..a26b222 100644
--- a/src/spec/doc/core-metaprogramming.adoc
+++ b/src/spec/doc/core-metaprogramming.adoc
@@ -2779,7 +2779,7 @@ include::{projectdir}/src/spec/test/SwingASTTransformsTest.groovy[tags=vetoable_
 
 ==== Test assistance
 [[xform-NotYetImplemented]]
-===== `@groovy.transform.NotYetImplemented`
+===== `@groovy.test.NotYetImplemented`
 
 `@NotYetImplemented` is used to invert the result of a JUnit 3/4 test case. It is in particular useful if a feature is not yet implemented but the test is. In that case, it is expected
 that the test fails. Marking it with `@NotYetImplemented` will inverse the result of the test, like in this example:
diff --git a/src/spec/test/BaseScriptSpecTest.groovy b/src/spec/test/BaseScriptSpecTest.groovy
index 7b35d4a..c6db6a0 100644
--- a/src/spec/test/BaseScriptSpecTest.groovy
+++ b/src/spec/test/BaseScriptSpecTest.groovy
@@ -16,6 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 
 @CompileStatic
diff --git a/src/spec/test/ClassDesignASTTransformsTest.groovy b/src/spec/test/ClassDesignASTTransformsTest.groovy
index cd32da4..46de328 100644
--- a/src/spec/test/ClassDesignASTTransformsTest.groovy
+++ b/src/spec/test/ClassDesignASTTransformsTest.groovy
@@ -16,6 +16,8 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+import groovy.test.GroovyTestCase
+
 class ClassDesignASTTransformsTest extends GroovyTestCase {
 
     void testDelegateTransformation() {
diff --git a/src/spec/test/ClassTest.groovy b/src/spec/test/ClassTest.groovy
index b6a2735..6264be7 100644
--- a/src/spec/test/ClassTest.groovy
+++ b/src/spec/test/ClassTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/CloningASTTransformsTest.groovy b/src/spec/test/CloningASTTransformsTest.groovy
index 5a4f7f7..25f33e8 100644
--- a/src/spec/test/CloningASTTransformsTest.groovy
+++ b/src/spec/test/CloningASTTransformsTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/ClosuresSpecTest.groovy b/src/spec/test/ClosuresSpecTest.groovy
index 5276b67..05fc9bf 100644
--- a/src/spec/test/ClosuresSpecTest.groovy
+++ b/src/spec/test/ClosuresSpecTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/CodeGenerationASTTransformsTest.groovy b/src/spec/test/CodeGenerationASTTransformsTest.groovy
index 970979b..d253bb2 100644
--- a/src/spec/test/CodeGenerationASTTransformsTest.groovy
+++ b/src/spec/test/CodeGenerationASTTransformsTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/CoercionTest.groovy b/src/spec/test/CoercionTest.groovy
index e0e114c..ff44750 100644
--- a/src/spec/test/CoercionTest.groovy
+++ b/src/spec/test/CoercionTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/CommandChainsTest.groovy b/src/spec/test/CommandChainsTest.groovy
index 1185022..4ba4625 100644
--- a/src/spec/test/CommandChainsTest.groovy
+++ b/src/spec/test/CommandChainsTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/CompilerDirectivesASTTransformsTest.groovy b/src/spec/test/CompilerDirectivesASTTransformsTest.groovy
index 8e72851..5d8c5bd 100644
--- a/src/spec/test/CompilerDirectivesASTTransformsTest.groovy
+++ b/src/spec/test/CompilerDirectivesASTTransformsTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/CustomizersTest.groovy b/src/spec/test/CustomizersTest.groovy
index 73c9857..27b0a3a 100644
--- a/src/spec/test/CustomizersTest.groovy
+++ b/src/spec/test/CustomizersTest.groovy
@@ -16,6 +16,8 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+
+import groovy.test.GroovyTestCase
 import groovy.transform.ConditionalInterrupt
 import groovy.util.logging.Log
 import org.codehaus.groovy.ast.ClassNode
diff --git a/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy b/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy
index 07ac669..60a218a 100644
--- a/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy
+++ b/src/spec/test/DeclarativeConcurrencyASTTransformsTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/DelegatesToSpecTest.groovy b/src/spec/test/DelegatesToSpecTest.groovy
index 0fdaca7..6eb65a1 100644
--- a/src/spec/test/DelegatesToSpecTest.groovy
+++ b/src/spec/test/DelegatesToSpecTest.groovy
@@ -16,6 +16,8 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class DelegatesToSpecTest extends GroovyTestCase {
diff --git a/src/spec/test/DesignPatternsTest.groovy b/src/spec/test/DesignPatternsTest.groovy
index 159626c..7f22a54 100644
--- a/src/spec/test/DesignPatternsTest.groovy
+++ b/src/spec/test/DesignPatternsTest.groovy
@@ -1558,7 +1558,7 @@ class DesignPatternsTest extends CompilableTestSupport {
                 }
             }
             // end::state_variation32[]
-
+            import groovy.test.GroovyTestCase
             // tag::state_variation33[]
             class StatePatternDslTest extends GroovyTestCase {
                 private fsm
diff --git a/src/spec/test/DifferencesFromJavaTest.groovy b/src/spec/test/DifferencesFromJavaTest.groovy
index 1161175..d3f935e 100644
--- a/src/spec/test/DifferencesFromJavaTest.groovy
+++ b/src/spec/test/DifferencesFromJavaTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/ExtensionModuleSpecTest.groovy b/src/spec/test/ExtensionModuleSpecTest.groovy
index af1217b..f1b1ec0 100644
--- a/src/spec/test/ExtensionModuleSpecTest.groovy
+++ b/src/spec/test/ExtensionModuleSpecTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/IntegrationTest.groovy b/src/spec/test/IntegrationTest.groovy
index 8933764..5919610 100644
--- a/src/spec/test/IntegrationTest.groovy
+++ b/src/spec/test/IntegrationTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/LogImprovementsASTTransformsTest.groovy b/src/spec/test/LogImprovementsASTTransformsTest.groovy
index a979318..8e7ea59 100644
--- a/src/spec/test/LogImprovementsASTTransformsTest.groovy
+++ b/src/spec/test/LogImprovementsASTTransformsTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/PackageTest.groovy b/src/spec/test/PackageTest.groovy
index 260a127..a143f6e 100644
--- a/src/spec/test/PackageTest.groovy
+++ b/src/spec/test/PackageTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/PrimitiveTest.groovy b/src/spec/test/PrimitiveTest.groovy
index 2780fba..5fb5718 100644
--- a/src/spec/test/PrimitiveTest.groovy
+++ b/src/spec/test/PrimitiveTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/SaferScriptingASTTransformsTest.groovy b/src/spec/test/SaferScriptingASTTransformsTest.groovy
index 55ff72b..2b490d6 100644
--- a/src/spec/test/SaferScriptingASTTransformsTest.groovy
+++ b/src/spec/test/SaferScriptingASTTransformsTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/ScriptsAndClassesSpecTest.groovy b/src/spec/test/ScriptsAndClassesSpecTest.groovy
index 0364387..e36eaf2 100644
--- a/src/spec/test/ScriptsAndClassesSpecTest.groovy
+++ b/src/spec/test/ScriptsAndClassesSpecTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/SwingASTTransformsTest.groovy b/src/spec/test/SwingASTTransformsTest.groovy
index 3c0d28a..090e327 100644
--- a/src/spec/test/SwingASTTransformsTest.groovy
+++ b/src/spec/test/SwingASTTransformsTest.groovy
@@ -1,3 +1,5 @@
+import groovy.test.GroovyTestCase
+
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one
  *  or more contributor license agreements.  See the NOTICE file
diff --git a/src/spec/test/TestingASTTransformsTest.groovy b/src/spec/test/TestingASTTransformsTest.groovy
index 11197cc..7ee4155 100644
--- a/src/spec/test/TestingASTTransformsTest.groovy
+++ b/src/spec/test/TestingASTTransformsTest.groovy
@@ -16,10 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+import groovy.test.GroovyTestCase
+
 class TestingASTTransformsTest extends GroovyTestCase {
     void testNotYetImplemented() {
         assertScript '''// tag::notyetimplemented[]
-import groovy.transform.NotYetImplemented
+import groovy.test.GroovyTestCase
+import groovy.test.NotYetImplemented
 
 class Maths {
     static int fib(int n) {
diff --git a/src/spec/test/TraitsSpecificationTest.groovy b/src/spec/test/TraitsSpecificationTest.groovy
index a88e31e..dc887ef 100644
--- a/src/spec/test/TraitsSpecificationTest.groovy
+++ b/src/spec/test/TraitsSpecificationTest.groovy
@@ -16,6 +16,8 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.ClassNode
 
@@ -374,6 +376,7 @@ greet { 'Alice' }                           // <2>
     void testTraitOverrideBehavior() {
         assertScript '''
 // tag::forceoverride_header[]
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer
diff --git a/src/spec/test/builder/FileTreeBuilderTest.groovy b/src/spec/test/builder/FileTreeBuilderTest.groovy
index 3a3c699..9910967 100644
--- a/src/spec/test/builder/FileTreeBuilderTest.groovy
+++ b/src/spec/test/builder/FileTreeBuilderTest.groovy
@@ -18,6 +18,8 @@
  */
 package builder
 
+import groovy.test.GroovyTestCase
+
 class FileTreeBuilderTest extends GroovyTestCase {
     File tmpDir
 
@@ -37,7 +39,7 @@ class FileTreeBuilderTest extends GroovyTestCase {
             }
             dir('test') {
                dir('groovy') {
-                  file('FooTest.groovy', 'class FooTest extends GroovyTestCase {}')
+                  file('FooTest.groovy', 'class FooTest extends groovy.test.GroovyTestCase {}')
                }
             }
          }
@@ -45,7 +47,7 @@ class FileTreeBuilderTest extends GroovyTestCase {
          
          // tag::example_assert[]
          assert new File(tmpDir, '/src/main/groovy/Foo.groovy').text == 'println "Hello"'
-         assert new File(tmpDir, '/src/test/groovy/FooTest.groovy').text == 'class FooTest extends GroovyTestCase {}'
+         assert new File(tmpDir, '/src/test/groovy/FooTest.groovy').text == 'class FooTest extends groovy.test.GroovyTestCase {}'
          // end::example_assert[]
     }
     
@@ -61,7 +63,7 @@ class FileTreeBuilderTest extends GroovyTestCase {
             }
             test {
                groovy {
-                  'FooTest.groovy'('class FooTest extends GroovyTestCase {}')
+                  'FooTest.groovy'('class FooTest extends groovy.test.GroovyTestCase {}')
                }
             }
          }
@@ -69,7 +71,7 @@ class FileTreeBuilderTest extends GroovyTestCase {
          
          // tag::shorthand_syntax_assert[]
          assert new File(tmpDir, '/src/main/groovy/Foo.groovy').text == 'println "Hello"'
-         assert new File(tmpDir, '/src/test/groovy/FooTest.groovy').text == 'class FooTest extends GroovyTestCase {}'
+         assert new File(tmpDir, '/src/test/groovy/FooTest.groovy').text == 'class FooTest extends groovy.test.GroovyTestCase {}'
          // end::shorthand_syntax_assert[]
     }    
  }
diff --git a/src/spec/test/builder/NodeBuilderTest.groovy b/src/spec/test/builder/NodeBuilderTest.groovy
index be2d385..bcc814d 100644
--- a/src/spec/test/builder/NodeBuilderTest.groovy
+++ b/src/spec/test/builder/NodeBuilderTest.groovy
@@ -18,6 +18,8 @@
  */
 package builder
 
+import groovy.test.GroovyTestCase
+
 class NodeBuilderTest extends GroovyTestCase {
 
     void testNodeBuilder() {
diff --git a/src/spec/test/builder/ObjectGraphBuilderTest.groovy b/src/spec/test/builder/ObjectGraphBuilderTest.groovy
index 3f3d987..d12748c 100644
--- a/src/spec/test/builder/ObjectGraphBuilderTest.groovy
+++ b/src/spec/test/builder/ObjectGraphBuilderTest.groovy
@@ -19,6 +19,7 @@
 package builder
 
 import asciidoctor.Utils
+import groovy.test.GroovyTestCase
 
 /**
 * Tests for ObjectGraphBuilder. The tests directly in this file are specific
diff --git a/src/spec/test/cli/CliBuilderTestCase.groovy b/src/spec/test/cli/CliBuilderTestCase.groovy
index 3fb9f88..0275988 100644
--- a/src/spec/test/cli/CliBuilderTestCase.groovy
+++ b/src/spec/test/cli/CliBuilderTestCase.groovy
@@ -18,6 +18,8 @@
  */
 package cli
 
+import groovy.test.GroovyTestCase
+
 abstract class CliBuilderTestCase extends GroovyTestCase {
 
     abstract String getImportCliBuilder()
diff --git a/src/spec/test/gdk/ConfigSlurperTest.groovy b/src/spec/test/gdk/ConfigSlurperTest.groovy
index 13e53d8..1ac7336 100644
--- a/src/spec/test/gdk/ConfigSlurperTest.groovy
+++ b/src/spec/test/gdk/ConfigSlurperTest.groovy
@@ -18,6 +18,8 @@
  */
 package gdk
 
+import groovy.test.GroovyTestCase
+
 class ConfigSlurperTest extends GroovyTestCase {
     void testWithArbitraryTypes() {
         // tag::arbitrary_types[]
diff --git a/src/spec/test/gdk/ExpandoTest.groovy b/src/spec/test/gdk/ExpandoTest.groovy
index ec75501..200bc3b 100644
--- a/src/spec/test/gdk/ExpandoTest.groovy
+++ b/src/spec/test/gdk/ExpandoTest.groovy
@@ -18,6 +18,8 @@
  */
 package gdk
 
+import groovy.test.GroovyTestCase
+
 class ExpandoTest extends GroovyTestCase {
     void testExpandoAddProperty() {
         // tag::expando_property[]
diff --git a/src/spec/test/gdk/ObservableTest.groovy b/src/spec/test/gdk/ObservableTest.groovy
index 2749ba1..a4c94ce 100644
--- a/src/spec/test/gdk/ObservableTest.groovy
+++ b/src/spec/test/gdk/ObservableTest.groovy
@@ -18,6 +18,8 @@
  */
 package gdk
 
+import groovy.test.GroovyTestCase
+
 import java.beans.PropertyChangeListener
 
 class ObservableTest extends GroovyTestCase {
diff --git a/src/spec/test/gdk/WorkingWithCollectionsTest.groovy b/src/spec/test/gdk/WorkingWithCollectionsTest.groovy
index a117ab1..46d8c74 100644
--- a/src/spec/test/gdk/WorkingWithCollectionsTest.groovy
+++ b/src/spec/test/gdk/WorkingWithCollectionsTest.groovy
@@ -18,6 +18,8 @@
  */
 package gdk
 
+import groovy.test.GroovyTestCase
+
 class WorkingWithCollectionsTest extends GroovyTestCase {
     void testListLiterals() {
         // tag::list_literals[]
diff --git a/src/spec/test/gdk/WorkingWithIOSpecTest.groovy b/src/spec/test/gdk/WorkingWithIOSpecTest.groovy
index ebd8102..8ad1cf8 100644
--- a/src/spec/test/gdk/WorkingWithIOSpecTest.groovy
+++ b/src/spec/test/gdk/WorkingWithIOSpecTest.groovy
@@ -16,12 +16,11 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-
-
 package gdk
 
 import groovy.io.FileType
 import groovy.io.FileVisitResult
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/src/spec/test/metaprogramming/ASTMatcherFilteringTest.groovy b/src/spec/test/metaprogramming/ASTMatcherFilteringTest.groovy
index 5c40e5e..a208f9d 100644
--- a/src/spec/test/metaprogramming/ASTMatcherFilteringTest.groovy
+++ b/src/spec/test/metaprogramming/ASTMatcherFilteringTest.groovy
@@ -19,6 +19,7 @@
 
 package metaprogramming
 
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.ast.ASTNode
 import org.codehaus.groovy.ast.ClassCodeExpressionTransformer
diff --git a/src/spec/test/metaprogramming/ASTMatcherTestingTest.groovy b/src/spec/test/metaprogramming/ASTMatcherTestingTest.groovy
index d86101f..16fc0c6 100644
--- a/src/spec/test/metaprogramming/ASTMatcherTestingTest.groovy
+++ b/src/spec/test/metaprogramming/ASTMatcherTestingTest.groovy
@@ -19,6 +19,7 @@
 
 package metaprogramming
 
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.ast.ASTNode
diff --git a/src/spec/test/metaprogramming/ASTXFormSpecTest.groovy b/src/spec/test/metaprogramming/ASTXFormSpecTest.groovy
index d5cc71e..7f99191 100644
--- a/src/spec/test/metaprogramming/ASTXFormSpecTest.groovy
+++ b/src/spec/test/metaprogramming/ASTXFormSpecTest.groovy
@@ -19,6 +19,7 @@
 package metaprogramming
 
 import asciidoctor.Utils
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.control.CompilationUnit
 import org.codehaus.groovy.control.CompilePhase
diff --git a/src/spec/test/metaprogramming/CategoryTest.groovy b/src/spec/test/metaprogramming/CategoryTest.groovy
index 8123cf7..16bd7b0 100644
--- a/src/spec/test/metaprogramming/CategoryTest.groovy
+++ b/src/spec/test/metaprogramming/CategoryTest.groovy
@@ -18,6 +18,7 @@
  */
 package metaprogramming
 
+import groovy.test.GroovyTestCase
 import groovy.time.TimeCategory
 
 class CategoryTest extends GroovyTestCase {
diff --git a/src/spec/test/metaprogramming/ExpandoMetaClassTest.groovy b/src/spec/test/metaprogramming/ExpandoMetaClassTest.groovy
index 03f1d1a..a3895a8 100644
--- a/src/spec/test/metaprogramming/ExpandoMetaClassTest.groovy
+++ b/src/spec/test/metaprogramming/ExpandoMetaClassTest.groovy
@@ -18,6 +18,8 @@
  */
 package metaprogramming
 
+import groovy.test.GroovyTestCase
+
 
 class ExpandoMetaClassTest extends GroovyTestCase {
 
diff --git a/src/spec/test/metaprogramming/GroovyObjectTest.groovy b/src/spec/test/metaprogramming/GroovyObjectTest.groovy
index 0d57857..29f73b2 100644
--- a/src/spec/test/metaprogramming/GroovyObjectTest.groovy
+++ b/src/spec/test/metaprogramming/GroovyObjectTest.groovy
@@ -18,6 +18,8 @@
  */
 package metaprogramming
 
+import groovy.test.GroovyTestCase
+
 class GroovyObjectTest extends GroovyTestCase {
     void testInvokeMethod() {
         assertScript '''
diff --git a/src/spec/test/metaprogramming/InterceptableTest.groovy b/src/spec/test/metaprogramming/InterceptableTest.groovy
index 9fbc184..e3fea05 100644
--- a/src/spec/test/metaprogramming/InterceptableTest.groovy
+++ b/src/spec/test/metaprogramming/InterceptableTest.groovy
@@ -18,6 +18,8 @@
  */
 package metaprogramming
 
+import groovy.test.GroovyTestCase
+
 // tag::groovy_interceptable_test[]
 class InterceptableTest extends GroovyTestCase {
 
diff --git a/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy b/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy
index ddd6349..8764a92 100644
--- a/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy
+++ b/src/spec/test/metaprogramming/InterceptionThroughMetaClassTest.groovy
@@ -18,6 +18,7 @@
  */
 package metaprogramming
 
+import groovy.test.GroovyTestCase
 import groovy.xml.Entity
 
 // tag::meta_class_interception[]
diff --git a/src/spec/test/metaprogramming/MacroClassTest.groovy b/src/spec/test/metaprogramming/MacroClassTest.groovy
index 818ce43..1820bbb 100644
--- a/src/spec/test/metaprogramming/MacroClassTest.groovy
+++ b/src/spec/test/metaprogramming/MacroClassTest.groovy
@@ -19,6 +19,7 @@
 
 package metaprogramming
 
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.ast.ASTNode
diff --git a/src/spec/test/metaprogramming/MacroExpressionTest.groovy b/src/spec/test/metaprogramming/MacroExpressionTest.groovy
index 4f36ab1..0c57bf8 100644
--- a/src/spec/test/metaprogramming/MacroExpressionTest.groovy
+++ b/src/spec/test/metaprogramming/MacroExpressionTest.groovy
@@ -19,6 +19,7 @@
 
 package metaprogramming
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.ASTNode
 import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.ClassNode
diff --git a/src/spec/test/metaprogramming/MacroStatementTest.groovy b/src/spec/test/metaprogramming/MacroStatementTest.groovy
index 541341c..a714f41 100644
--- a/src/spec/test/metaprogramming/MacroStatementTest.groovy
+++ b/src/spec/test/metaprogramming/MacroStatementTest.groovy
@@ -19,6 +19,7 @@
 
 package metaprogramming
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.*
 import org.codehaus.groovy.ast.expr.ConstantExpression
 import org.codehaus.groovy.ast.stmt.ReturnStatement
diff --git a/src/spec/test/metaprogramming/MacroVariableSubstitutionTest.groovy b/src/spec/test/metaprogramming/MacroVariableSubstitutionTest.groovy
index b5be446..31a51bf 100644
--- a/src/spec/test/metaprogramming/MacroVariableSubstitutionTest.groovy
+++ b/src/spec/test/metaprogramming/MacroVariableSubstitutionTest.groovy
@@ -19,6 +19,7 @@
 
 package metaprogramming
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.*
 import org.codehaus.groovy.ast.expr.VariableExpression
 import org.codehaus.groovy.ast.stmt.BlockStatement
diff --git a/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy b/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy
index beac888..c03aeb4 100644
--- a/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy
+++ b/src/spec/test/metaprogramming/MethodPropertyMissingTest.groovy
@@ -18,6 +18,8 @@
  */
 package metaprogramming
 
+import groovy.test.GroovyTestCase
+
 class MethodPropertyMissingTest extends GroovyTestCase {
 
     void testMethodMissing() {
diff --git a/src/spec/test/metaprogramming/StaticPropertyMissingAndMethodMissingTest.groovy b/src/spec/test/metaprogramming/StaticPropertyMissingAndMethodMissingTest.groovy
index f474646..57c4a6f 100644
--- a/src/spec/test/metaprogramming/StaticPropertyMissingAndMethodMissingTest.groovy
+++ b/src/spec/test/metaprogramming/StaticPropertyMissingAndMethodMissingTest.groovy
@@ -18,6 +18,8 @@
  */
 package metaprogramming
 
+import groovy.test.GroovyTestCase
+
 class StaticPropertyMissingAndMethodMissingTest extends GroovyTestCase {
 
     void testStaticMethodMissing() {
diff --git a/src/spec/test/objectorientation/MethodsTest.groovy b/src/spec/test/objectorientation/MethodsTest.groovy
index e89d263..a0278bb 100644
--- a/src/spec/test/objectorientation/MethodsTest.groovy
+++ b/src/spec/test/objectorientation/MethodsTest.groovy
@@ -18,6 +18,8 @@
  */
 package objectorientation
 
+import groovy.test.GroovyTestCase
+
 class MethodsTest extends GroovyTestCase {
 
     void testMethodDefinition() {
diff --git a/src/spec/test/semantics/GPathTest.groovy b/src/spec/test/semantics/GPathTest.groovy
index b61e8e0..2afeff4 100644
--- a/src/spec/test/semantics/GPathTest.groovy
+++ b/src/spec/test/semantics/GPathTest.groovy
@@ -18,7 +18,8 @@
  */
 package semantics
 
-import asciidoctor.Utils
+import groovy.test.GroovyTestCase
+import groovy.xml.XmlSlurper
 
 class GPathTest extends GroovyTestCase {
 
diff --git a/src/spec/test/semantics/LabelsTest.groovy b/src/spec/test/semantics/LabelsTest.groovy
index 0f79672..cf5f379 100644
--- a/src/spec/test/semantics/LabelsTest.groovy
+++ b/src/spec/test/semantics/LabelsTest.groovy
@@ -18,6 +18,8 @@
  */
 package semantics
 
+import groovy.test.GroovyTestCase
+
 class LabelsTest extends GroovyTestCase {
     void testLabels() {
         // tag::test_labels[]
diff --git a/src/spec/test/semantics/PowerAssertTest.groovy b/src/spec/test/semantics/PowerAssertTest.groovy
index cf4f77c..5e42027 100644
--- a/src/spec/test/semantics/PowerAssertTest.groovy
+++ b/src/spec/test/semantics/PowerAssertTest.groovy
@@ -19,6 +19,7 @@
 package semantics
 
 import asciidoctor.Utils
+import groovy.test.GroovyTestCase
 
 class PowerAssertTest extends GroovyTestCase {
     void testPowerAssert() {
diff --git a/src/spec/test/semantics/TheGroovyTruthTest.groovy b/src/spec/test/semantics/TheGroovyTruthTest.groovy
index e5ff99d..eb2791c 100644
--- a/src/spec/test/semantics/TheGroovyTruthTest.groovy
+++ b/src/spec/test/semantics/TheGroovyTruthTest.groovy
@@ -18,6 +18,8 @@
  */
 package semantics
 
+import groovy.test.GroovyTestCase
+
 class TheGroovyTruthTest extends GroovyTestCase {
 
     void testGroovyTruth() {
diff --git a/src/spec/test/testingguide/GDKMethodTests.groovy b/src/spec/test/testingguide/GDKMethodTests.groovy
index 9428570..e7b5892 100644
--- a/src/spec/test/testingguide/GDKMethodTests.groovy
+++ b/src/spec/test/testingguide/GDKMethodTests.groovy
@@ -18,6 +18,8 @@
  */
 package testingguide
 
+import groovy.test.GroovyTestCase
+
 class GDKMethodTests extends GroovyTestCase {
 
     // tag::combinations[]
diff --git a/src/spec/test/testingguide/GroovyTestCaseExampleTests.groovy b/src/spec/test/testingguide/GroovyTestCaseExampleTests.groovy
index cc6a98e..5634538 100644
--- a/src/spec/test/testingguide/GroovyTestCaseExampleTests.groovy
+++ b/src/spec/test/testingguide/GroovyTestCaseExampleTests.groovy
@@ -18,7 +18,8 @@
  */
 package testingguide
 
-import groovy.transform.NotYetImplemented
+import groovy.test.GroovyTestCase
+import groovy.test.NotYetImplemented
 
 class GroovyTestCaseExampleTests extends GroovyTestCase {
 
diff --git a/src/spec/test/testingguide/MockingExampleTests.groovy b/src/spec/test/testingguide/MockingExampleTests.groovy
index 88806b7..ae3da30 100644
--- a/src/spec/test/testingguide/MockingExampleTests.groovy
+++ b/src/spec/test/testingguide/MockingExampleTests.groovy
@@ -20,6 +20,7 @@ package testingguide
 
 import groovy.mock.interceptor.MockFor
 import groovy.mock.interceptor.StubFor
+import groovy.test.GroovyTestCase
 
 // tag::map_coercion[]
         class TranslationService {
diff --git a/src/spec/test/typing/OptionalTypingTest.groovy b/src/spec/test/typing/OptionalTypingTest.groovy
index c8a90e7..4f3fa72 100644
--- a/src/spec/test/typing/OptionalTypingTest.groovy
+++ b/src/spec/test/typing/OptionalTypingTest.groovy
@@ -18,6 +18,8 @@
  */
 package typing
 
+import groovy.test.GroovyTestCase
+
 class OptionalTypingTest extends GroovyTestCase {
 
     void testOptionalTypingInVariableDeclaration() {
diff --git a/src/spec/test/typing/StaticCompilationIntroTest.groovy b/src/spec/test/typing/StaticCompilationIntroTest.groovy
index 34d2643..1fad826 100644
--- a/src/spec/test/typing/StaticCompilationIntroTest.groovy
+++ b/src/spec/test/typing/StaticCompilationIntroTest.groovy
@@ -18,6 +18,8 @@
  */
 package typing
 
+import groovy.test.GroovyTestCase
+
 class StaticCompilationIntroTest extends GroovyTestCase {
 
     private static String TYPESAFE_PROGRAM = '''
diff --git a/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy b/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
index cb1e4fa..e708b73 100644
--- a/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
+++ b/src/spec/test/typing/TypeCheckingExtensionSpecTest.groovy
@@ -20,6 +20,7 @@ package typing
 
 import groovy.$Temp
 import groovy.test.GroovyAssert
+import groovy.test.GroovyTestCase
 import groovy.transform.TypeChecked
 import groovy.xml.MarkupBuilder
 import org.codehaus.groovy.control.CompilerConfiguration
diff --git a/src/tck/test/gls/ch03/s01/Unicode1.groovy b/src/tck/test/gls/ch03/s01/Unicode1.groovy
index 92984ab..60ebbab 100644
--- a/src/tck/test/gls/ch03/s01/Unicode1.groovy
+++ b/src/tck/test/gls/ch03/s01/Unicode1.groovy
@@ -16,7 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package gls.ch03.s01;
+package gls.ch03.s01
+
+import groovy.test.GroovyTestCase
 
 /**
  * Except for comments, identifiers and the contents of ... string 
diff --git a/src/tck/test/gls/ch03/s01/Unicode2.groovy b/src/tck/test/gls/ch03/s01/Unicode2.groovy
index b845366..3baff7a 100644
--- a/src/tck/test/gls/ch03/s01/Unicode2.groovy
+++ b/src/tck/test/gls/ch03/s01/Unicode2.groovy
@@ -16,7 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package gls.ch03.s01;
+package gls.ch03.s01
+
+import groovy.test.GroovyTestCase
 
 /**
  * Except for comments, identifiers and the contents of ... string 
diff --git a/src/tck/test/gls/ch03/s02/LexicalTranslation1.groovy b/src/tck/test/gls/ch03/s02/LexicalTranslation1.groovy
index 1c27135..c2eb29c 100644
--- a/src/tck/test/gls/ch03/s02/LexicalTranslation1.groovy
+++ b/src/tck/test/gls/ch03/s02/LexicalTranslation1.groovy
@@ -18,6 +18,8 @@
  */
 package gls.ch03.s02
 
+import groovy.test.GroovyTestCase
+
 /**
  * Checks Lexical Translation steps as defined in $3.2 of GLS
  */
diff --git a/src/tck/test/gls/ch03/s02/Longest1.groovy b/src/tck/test/gls/ch03/s02/Longest1.groovy
index 940f3c6..5e4c986 100644
--- a/src/tck/test/gls/ch03/s02/Longest1.groovy
+++ b/src/tck/test/gls/ch03/s02/Longest1.groovy
@@ -18,6 +18,8 @@
  */
 package gls.ch03.s02
 
+import groovy.test.GroovyTestCase
+
 /**
  * GLS 3.2: The longest possible translation is used at each step, even if the 
  * result does not ultimately make a correct program while another lexical 
diff --git a/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy b/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy
index 3f23dfd..3024bf5 100644
--- a/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy
+++ b/src/tck/test/gls/ch03/s03/UnicodeEscapes1.groovy
@@ -18,6 +18,8 @@
  */
 package gls.ch03.s03
 
+import groovy.test.GroovyTestCase
+
 /**
  * GLS 3.3:
  * Implementations first recognize Unicode escapes in their input, translating 
diff --git a/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy b/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy
index e78a3d7..55cd53e 100644
--- a/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy
+++ b/src/tck/test/gls/ch03/s03/UnicodeEscapes2.groovy
@@ -18,6 +18,8 @@
  */
 package gls.ch03.s03
 
+import groovy.test.GroovyTestCase
+
 /**
  * GLS 3.3:
  * Implementations first recognize Unicode escapes in their input, translating 
diff --git a/src/test/gls/CompilableTestSupport.groovy b/src/test/gls/CompilableTestSupport.groovy
index eed62a5..183c575 100644
--- a/src/test/gls/CompilableTestSupport.groovy
+++ b/src/test/gls/CompilableTestSupport.groovy
@@ -18,6 +18,7 @@
  */
 package gls
 
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.control.CompilationFailedException
 
diff --git a/src/test/gls/annotations/closures/AnnotationClosureTest.groovy b/src/test/gls/annotations/closures/AnnotationClosureTest.groovy
index 08a36dc..3b8d5d1 100644
--- a/src/test/gls/annotations/closures/AnnotationClosureTest.groovy
+++ b/src/test/gls/annotations/closures/AnnotationClosureTest.groovy
@@ -19,7 +19,7 @@
 package gls.annotations.closures
 
 import gls.CompilableTestSupport
-import groovy.transform.NotYetImplemented
+import groovy.test.NotYetImplemented
 
 import java.lang.annotation.RetentionPolicy
 import java.lang.annotation.Retention
diff --git a/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy b/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy
index b60b733..c998caf 100644
--- a/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy
+++ b/src/test/gls/annotations/closures/AnnotationClosureWithNonLocalVariable.groovy
@@ -18,6 +18,8 @@
  */
 package gls.annotations.closures
 
+import groovy.test.GroovyTestCase
+
 class AnnotationClosureWithNonLocalVariable extends GroovyTestCase {
     
     void testVanillaVariable() {
diff --git a/src/test/gls/ch06/s05/GName1Test.groovy b/src/test/gls/ch06/s05/GName1Test.groovy
index 3c3e871..6f4dfbc 100644
--- a/src/test/gls/ch06/s05/GName1Test.groovy
+++ b/src/test/gls/ch06/s05/GName1Test.groovy
@@ -24,6 +24,7 @@ import gls.ch06.s05.testClasses.Tt1gi
 import gls.ch06.s05.testClasses.Tt1go
 import gls.ch06.s05.testClasses.Tt1
 import gls.ch06.s05.testClasses.Tt1c
+import groovy.test.GroovyTestCase
 
 class GName1Test extends GroovyTestCase {
   void testObjectSupportNameHandling() {
diff --git a/src/test/gls/closures/ResolveStrategyTest.groovy b/src/test/gls/closures/ResolveStrategyTest.groovy
index ea7cb8d..e9cb637 100644
--- a/src/test/gls/closures/ResolveStrategyTest.groovy
+++ b/src/test/gls/closures/ResolveStrategyTest.groovy
@@ -18,6 +18,7 @@
  */
 package gls.closures
 
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 import static groovy.lang.Closure.*
 
diff --git a/src/test/gls/innerClass/InnerClassTest.groovy b/src/test/gls/innerClass/InnerClassTest.groovy
index 6390075..7bfd0ab 100644
--- a/src/test/gls/innerClass/InnerClassTest.groovy
+++ b/src/test/gls/innerClass/InnerClassTest.groovy
@@ -18,7 +18,7 @@
  */
 package gls.innerClass
 
-import groovy.transform.NotYetImplemented
+import groovy.test.NotYetImplemented
 import org.codehaus.groovy.control.CompilationFailedException
 import org.junit.Test
 
diff --git a/src/test/gls/innerClass/InnerInterfaceTest.groovy b/src/test/gls/innerClass/InnerInterfaceTest.groovy
index 4ac2001..4021c42 100644
--- a/src/test/gls/innerClass/InnerInterfaceTest.groovy
+++ b/src/test/gls/innerClass/InnerInterfaceTest.groovy
@@ -18,6 +18,8 @@
  */
 package gls.innerClass
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests on inner interface usage
  */
diff --git a/src/test/gls/invocation/ClassDuplicationTest.groovy b/src/test/gls/invocation/ClassDuplicationTest.groovy
index 38c8c63..78139f3 100644
--- a/src/test/gls/invocation/ClassDuplicationTest.groovy
+++ b/src/test/gls/invocation/ClassDuplicationTest.groovy
@@ -18,6 +18,8 @@
  */
 package gls.invocation
 
+import groovy.test.GroovyTestCase
+
 final class ClassDuplicationTest extends GroovyTestCase {
     void testDuplicationOnMethodSignatureTest() {
         def shell1 = new GroovyShell(this.class.classLoader)
diff --git a/src/test/gls/invocation/DefaultParamTest.groovy b/src/test/gls/invocation/DefaultParamTest.groovy
index d7a501f..341e681 100644
--- a/src/test/gls/invocation/DefaultParamTest.groovy
+++ b/src/test/gls/invocation/DefaultParamTest.groovy
@@ -18,6 +18,7 @@
  */
 package gls.invocation
 
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 
 @CompileStatic
diff --git a/src/test/gls/scope/VariablePrecedenceTest.groovy b/src/test/gls/scope/VariablePrecedenceTest.groovy
index 16197d5..f93b62e 100644
--- a/src/test/gls/scope/VariablePrecedenceTest.groovy
+++ b/src/test/gls/scope/VariablePrecedenceTest.groovy
@@ -18,6 +18,8 @@
  */
 package gls.scope
 
+import groovy.test.GroovyTestCase
+
 /**
 *  test case based on GROOVY-3069
 */
diff --git a/src/test/gls/syntax/Gep3OrderDslTest.groovy b/src/test/gls/syntax/Gep3OrderDslTest.groovy
index 640beaa..8e5948f 100644
--- a/src/test/gls/syntax/Gep3OrderDslTest.groovy
+++ b/src/test/gls/syntax/Gep3OrderDslTest.groovy
@@ -18,6 +18,7 @@
  */
 package gls.syntax
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.CompilerConfiguration
 
 class Gep3OrderDslTest extends GroovyTestCase {
diff --git a/src/test/gls/syntax/Gep3Test.groovy b/src/test/gls/syntax/Gep3Test.groovy
index 1cfbfc0..2b100db 100644
--- a/src/test/gls/syntax/Gep3Test.groovy
+++ b/src/test/gls/syntax/Gep3Test.groovy
@@ -18,6 +18,8 @@
  */
 package gls.syntax
 
+import groovy.test.GroovyTestCase
+
 import static Container.*
 import static Ingredient.*
 import static CookingAction.*
diff --git a/src/test/groovy/ActorTest.groovy b/src/test/groovy/ActorTest.groovy
index 5ad0993..815626f 100644
--- a/src/test/groovy/ActorTest.groovy
+++ b/src/test/groovy/ActorTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.locks.ReentrantLock
 import java.util.concurrent.LinkedBlockingQueue
diff --git a/src/test/groovy/AmbiguousInvocationTest.groovy b/src/test/groovy/AmbiguousInvocationTest.groovy
index 2172dc8..d4bb3dc 100644
--- a/src/test/groovy/AmbiguousInvocationTest.groovy
+++ b/src/test/groovy/AmbiguousInvocationTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * to prove GROOVY-467 is no longer an issue    
  */
diff --git a/src/test/groovy/ArrayAutoboxingTest.groovy b/src/test/groovy/ArrayAutoboxingTest.groovy
index 80d3dbc..24c01f6 100644
--- a/src/test/groovy/ArrayAutoboxingTest.groovy
+++ b/src/test/groovy/ArrayAutoboxingTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ArrayAutoboxingTest extends GroovyTestCase {
     
     void testUnwantedAutoboxingWhenInvokingMethods() {
diff --git a/src/test/groovy/ArrayCoerceTest.groovy b/src/test/groovy/ArrayCoerceTest.groovy
index 7bdb55b..6f84b27 100644
--- a/src/test/groovy/ArrayCoerceTest.groovy
+++ b/src/test/groovy/ArrayCoerceTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ArrayCoerceTest extends GroovyTestCase {
 
     Object[] field
diff --git a/src/test/groovy/ArrayParamMethodTest.groovy b/src/test/groovy/ArrayParamMethodTest.groovy
index f565537..638c76f 100644
--- a/src/test/groovy/ArrayParamMethodTest.groovy
+++ b/src/test/groovy/ArrayParamMethodTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ArrayParamMethodTest extends GroovyTestCase implements DummyInterface {
 
     void testMethodCall() {
diff --git a/src/test/groovy/ArrayTest.groovy b/src/test/groovy/ArrayTest.groovy
index d626153..c1456d5 100644
--- a/src/test/groovy/ArrayTest.groovy
+++ b/src/test/groovy/ArrayTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ArrayTest extends GroovyTestCase {
 
     void testFixedSize() {
diff --git a/src/test/groovy/ArrayTypeTest.groovy b/src/test/groovy/ArrayTypeTest.groovy
index 48f213b..064fbff 100644
--- a/src/test/groovy/ArrayTypeTest.groovy
+++ b/src/test/groovy/ArrayTypeTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ArrayTypeTest extends GroovyTestCase {
 
     void testClosureWithTypedParam() {
diff --git a/src/test/groovy/AsTest.groovy b/src/test/groovy/AsTest.groovy
index 7050059..ca0aa69 100644
--- a/src/test/groovy/AsTest.groovy
+++ b/src/test/groovy/AsTest.groovy
@@ -17,6 +17,9 @@
  *  under the License.
  */
 package groovy
+
+import groovy.test.GroovyTestCase
+
 /**
  * Test case for using the "as" keyword to convert between strings
  * and numbers in both directions.
diff --git a/src/test/groovy/AssertNumberTest.groovy b/src/test/groovy/AssertNumberTest.groovy
index 6ac6ff0..6d23c9f 100644
--- a/src/test/groovy/AssertNumberTest.groovy
+++ b/src/test/groovy/AssertNumberTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class AssertNumberTest extends GroovyTestCase {
 
     void testCompare() {
diff --git a/src/test/groovy/AssertTest.groovy b/src/test/groovy/AssertTest.groovy
index 26559ab..00baa57 100644
--- a/src/test/groovy/AssertTest.groovy
+++ b/src/test/groovy/AssertTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class AssertTest extends GroovyTestCase {
 
     void testAssert() {
diff --git a/src/test/groovy/Base64Test.groovy b/src/test/groovy/Base64Test.groovy
index 0904f86..e872414 100644
--- a/src/test/groovy/Base64Test.groovy
+++ b/src/test/groovy/Base64Test.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 import java.nio.charset.StandardCharsets
 
 class Base64Test extends GroovyTestCase {
diff --git a/src/test/groovy/BinaryStreamsTest.groovy b/src/test/groovy/BinaryStreamsTest.groovy
index 8c9e610..05c1b90 100755
--- a/src/test/groovy/BinaryStreamsTest.groovy
+++ b/src/test/groovy/BinaryStreamsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test case for DefaultGroovyMethods involving Object streams and data streams.
  */
diff --git a/src/test/groovy/BindingTest.groovy b/src/test/groovy/BindingTest.groovy
index 7f69afc..892a736 100644
--- a/src/test/groovy/BindingTest.groovy
+++ b/src/test/groovy/BindingTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class BindingTest extends GroovyTestCase {
 
     void testProperties() {
diff --git a/src/test/groovy/BitSetTest.groovy b/src/test/groovy/BitSetTest.groovy
index 5d21195..9910fca 100644
--- a/src/test/groovy/BitSetTest.groovy
+++ b/src/test/groovy/BitSetTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class BitSetTest extends GroovyTestCase{
 
     void testSubscriptOperator() {
diff --git a/src/test/groovy/CallInnerClassCtorTest.groovy b/src/test/groovy/CallInnerClassCtorTest.groovy
index e422d5c..9c16624 100644
--- a/src/test/groovy/CallInnerClassCtorTest.groovy
+++ b/src/test/groovy/CallInnerClassCtorTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Checks that it's possible to call inner classes constructor from groovy
  */
diff --git a/src/test/groovy/CastTest.groovy b/src/test/groovy/CastTest.groovy
index 217d325..ef4a4f5 100644
--- a/src/test/groovy/CastTest.groovy
+++ b/src/test/groovy/CastTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class CastTest extends GroovyTestCase {
 
     Short b = 1
diff --git a/src/test/groovy/CategoryTest.groovy b/src/test/groovy/CategoryTest.groovy
index efec30c..56bd4e1 100644
--- a/src/test/groovy/CategoryTest.groovy
+++ b/src/test/groovy/CategoryTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class CategoryTest extends GroovyTestCase {
 
     void setUp() {
diff --git a/src/test/groovy/ChainedAssignmentTest.groovy b/src/test/groovy/ChainedAssignmentTest.groovy
index 21243d3..19badc3 100644
--- a/src/test/groovy/ChainedAssignmentTest.groovy
+++ b/src/test/groovy/ChainedAssignmentTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ChainedAssignmentTest extends GroovyTestCase {
 
     def dummy(v) {
diff --git a/src/test/groovy/ClassExpressionTest.groovy b/src/test/groovy/ClassExpressionTest.groovy
index 69bcf05..29c664d 100644
--- a/src/test/groovy/ClassExpressionTest.groovy
+++ b/src/test/groovy/ClassExpressionTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /** 
  * Tests the use of classes as variable expressions
  */
diff --git a/src/test/groovy/ClassLoaderBug.groovy b/src/test/groovy/ClassLoaderBug.groovy
index 56371d0..256f334 100644
--- a/src/test/groovy/ClassLoaderBug.groovy
+++ b/src/test/groovy/ClassLoaderBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClassLoaderBug extends GroovyTestCase {
     
     static void main(args) {
diff --git a/src/test/groovy/ClassTest.groovy b/src/test/groovy/ClassTest.groovy
index 38931cb..8795c28 100644
--- a/src/test/groovy/ClassTest.groovy
+++ b/src/test/groovy/ClassTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClassTest extends GroovyTestCase {
 
     void testClassExpression() {
diff --git a/src/test/groovy/ClosureAsParamTest.groovy b/src/test/groovy/ClosureAsParamTest.groovy
index 03a0071..f4cc09d 100644
--- a/src/test/groovy/ClosureAsParamTest.groovy
+++ b/src/test/groovy/ClosureAsParamTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 import java.util.concurrent.Callable
 
 /**
diff --git a/src/test/groovy/ClosureCloneTest.groovy b/src/test/groovy/ClosureCloneTest.groovy
index adbe57b..8a96763 100644
--- a/src/test/groovy/ClosureCloneTest.groovy
+++ b/src/test/groovy/ClosureCloneTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClosureCloneTest extends GroovyTestCase {
 
     void testCloneOfClosure() {
diff --git a/src/test/groovy/ClosureComparatorTest.groovy b/src/test/groovy/ClosureComparatorTest.groovy
index e0f7c3d..d46bc36 100644
--- a/src/test/groovy/ClosureComparatorTest.groovy
+++ b/src/test/groovy/ClosureComparatorTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests for ClosureComparator
  */
diff --git a/src/test/groovy/ClosureComposeTest.groovy b/src/test/groovy/ClosureComposeTest.groovy
index 75eaab1..6814105 100644
--- a/src/test/groovy/ClosureComposeTest.groovy
+++ b/src/test/groovy/ClosureComposeTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 
 import java.util.function.Function
diff --git a/src/test/groovy/ClosureCurryTest.groovy b/src/test/groovy/ClosureCurryTest.groovy
index 5bdfb42..57bb4e0 100644
--- a/src/test/groovy/ClosureCurryTest.groovy
+++ b/src/test/groovy/ClosureCurryTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.DefaultGroovyMethods
 
 /**
diff --git a/src/test/groovy/ClosureDefaultParameterTest.groovy b/src/test/groovy/ClosureDefaultParameterTest.groovy
index e9f8255..0e70575 100644
--- a/src/test/groovy/ClosureDefaultParameterTest.groovy
+++ b/src/test/groovy/ClosureDefaultParameterTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClosureDefaultParameterTest extends GroovyTestCase {
 
     void testClosureWithDefaultParams() {
diff --git a/src/test/groovy/ClosureInClosureTest.groovy b/src/test/groovy/ClosureInClosureTest.groovy
index 8941cad..ac05370 100644
--- a/src/test/groovy/ClosureInClosureTest.groovy
+++ b/src/test/groovy/ClosureInClosureTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Bug illustrating the nested closures variable scope visibility issue.
  * l.each is ClosureInClosureBug$1 and it.each is ClosureInClosureBug$2
diff --git a/src/test/groovy/ClosureInStaticMethodTest.groovy b/src/test/groovy/ClosureInStaticMethodTest.groovy
index 4b3766a..775cb9c 100644
--- a/src/test/groovy/ClosureInStaticMethodTest.groovy
+++ b/src/test/groovy/ClosureInStaticMethodTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClosureInStaticMethodTest extends GroovyTestCase {
 
     void testClosureInStaticMethod() {
diff --git a/src/test/groovy/ClosureMethodCallTest.groovy b/src/test/groovy/ClosureMethodCallTest.groovy
index e9a24b5..d442373 100644
--- a/src/test/groovy/ClosureMethodCallTest.groovy
+++ b/src/test/groovy/ClosureMethodCallTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClosureMethodCallTest extends GroovyTestCase {
 
     void testCallingClosureWithMultipleArguments() {
diff --git a/src/test/groovy/ClosureMethodTest.groovy b/src/test/groovy/ClosureMethodTest.groovy
index 65a8438..e908629 100644
--- a/src/test/groovy/ClosureMethodTest.groovy
+++ b/src/test/groovy/ClosureMethodTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.DefaultGroovyMethods as DGM
 
 /**
diff --git a/src/test/groovy/ClosureMethodsOnFileTest.groovy b/src/test/groovy/ClosureMethodsOnFileTest.groovy
index 0d6f90f..b89aa86 100644
--- a/src/test/groovy/ClosureMethodsOnFileTest.groovy
+++ b/src/test/groovy/ClosureMethodsOnFileTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests various Closure methods in Groovy on file
  */
diff --git a/src/test/groovy/ClosureMissingMethodTest.groovy b/src/test/groovy/ClosureMissingMethodTest.groovy
index f16d58d..41d24eb 100644
--- a/src/test/groovy/ClosureMissingMethodTest.groovy
+++ b/src/test/groovy/ClosureMissingMethodTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClosureMissingMethodTest extends GroovyTestCase {
 
     void testInScript() {
diff --git a/src/test/groovy/ClosureReturnTest.groovy b/src/test/groovy/ClosureReturnTest.groovy
index 3842e56..2f52b71 100644
--- a/src/test/groovy/ClosureReturnTest.groovy
+++ b/src/test/groovy/ClosureReturnTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests Closures in Groovy
  */
diff --git a/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy b/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy
index 66ff192..c05a19e 100644
--- a/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy
+++ b/src/test/groovy/ClosureReturnWithoutReturnStatementTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClosureReturnWithoutReturnStatementTest extends GroovyTestCase {
 
     void testReturnValues() {
diff --git a/src/test/groovy/ClosureSugarTest.groovy b/src/test/groovy/ClosureSugarTest.groovy
index 569d705..613c7d8 100644
--- a/src/test/groovy/ClosureSugarTest.groovy
+++ b/src/test/groovy/ClosureSugarTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClosureSugarTest extends GroovyTestCase {
 
     def count;
diff --git a/src/test/groovy/ClosureTest.groovy b/src/test/groovy/ClosureTest.groovy
index b4d9607..e8b4f7d 100644
--- a/src/test/groovy/ClosureTest.groovy
+++ b/src/test/groovy/ClosureTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 import static groovy.lang.Closure.IDENTITY
diff --git a/src/test/groovy/ClosureUsingOuterVariablesTest.groovy b/src/test/groovy/ClosureUsingOuterVariablesTest.groovy
index 3aa87a5..8d39d16 100644
--- a/src/test/groovy/ClosureUsingOuterVariablesTest.groovy
+++ b/src/test/groovy/ClosureUsingOuterVariablesTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClosureUsingOuterVariablesTest extends GroovyTestCase {
 
     void testUseOfOuterVariable() {
diff --git a/src/test/groovy/ClosureWithDefaultParamTest.groovy b/src/test/groovy/ClosureWithDefaultParamTest.groovy
index 567e5c3..78c57e0 100644
--- a/src/test/groovy/ClosureWithDefaultParamTest.groovy
+++ b/src/test/groovy/ClosureWithDefaultParamTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Demonstrates the use of the default named parameter in a closure
  */
diff --git a/src/test/groovy/ClosureWithEmptyParametersTest.groovy b/src/test/groovy/ClosureWithEmptyParametersTest.groovy
index ab14a84..b844f6a 100644
--- a/src/test/groovy/ClosureWithEmptyParametersTest.groovy
+++ b/src/test/groovy/ClosureWithEmptyParametersTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ClosureWithEmptyParametersTest extends GroovyTestCase {
 
     void testNoParams() {
diff --git a/src/test/groovy/CollateTest.groovy b/src/test/groovy/CollateTest.groovy
index ca27560..4a032be 100644
--- a/src/test/groovy/CollateTest.groovy
+++ b/src/test/groovy/CollateTest.groovy
@@ -18,6 +18,8 @@
  */
  package groovy
 
+import groovy.test.GroovyTestCase
+
 class CollateTest extends GroovyTestCase {
   void testSimple() {
     def list = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
diff --git a/src/test/groovy/CompareEqualsTest.groovy b/src/test/groovy/CompareEqualsTest.groovy
index ab9d056..090d678 100644
--- a/src/test/groovy/CompareEqualsTest.groovy
+++ b/src/test/groovy/CompareEqualsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class CompareEqualsTest extends GroovyTestCase {
     void testEqualsOperatorIsMultimethodAware() {
         assert new Xyz() == new Xyz()
diff --git a/src/test/groovy/CompareToTest.groovy b/src/test/groovy/CompareToTest.groovy
index d144503..c8a94a2 100644
--- a/src/test/groovy/CompareToTest.groovy
+++ b/src/test/groovy/CompareToTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class CompareToTest extends GroovyTestCase {
 
     void testCompareTo() {
diff --git a/src/test/groovy/CompareTypesTest.groovy b/src/test/groovy/CompareTypesTest.groovy
index 1a98010..02b0d8d 100644
--- a/src/test/groovy/CompareTypesTest.groovy
+++ b/src/test/groovy/CompareTypesTest.groovy
@@ -18,9 +18,11 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  */
-class CompareTypesTest extends GroovyTestCase { 
+class CompareTypesTest extends GroovyTestCase {
     void testCompareByteToInt() { 
         Byte a = 12
         Integer b = 10
diff --git a/src/test/groovy/CompileOrderTest.groovy b/src/test/groovy/CompileOrderTest.groovy
index 2fa008c..72f0e16 100644
--- a/src/test/groovy/CompileOrderTest.groovy
+++ b/src/test/groovy/CompileOrderTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class CompileOrderTest extends GroovyTestCase {
    void testCompileOrder() {
       def interfaceFile = File.createTempFile("TestOrderInterface", ".groovy", new File("target"))
diff --git a/src/test/groovy/CompilerErrorTest.groovy b/src/test/groovy/CompilerErrorTest.groovy
index 21b67be..59b5a41 100644
--- a/src/test/groovy/CompilerErrorTest.groovy
+++ b/src/test/groovy/CompilerErrorTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class CompilerErrorTest extends GroovyTestCase {
 
     void testBadMethodName() {
diff --git a/src/test/groovy/Constructor2Test.groovy b/src/test/groovy/Constructor2Test.groovy
index 7fb042c..6ae4255 100644
--- a/src/test/groovy/Constructor2Test.groovy
+++ b/src/test/groovy/Constructor2Test.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class Constructor2Test extends GroovyTestCase {
 
     Constructor2Test() { }
diff --git a/src/test/groovy/ConstructorTest.groovy b/src/test/groovy/ConstructorTest.groovy
index b22d0c3..e232ed2 100644
--- a/src/test/groovy/ConstructorTest.groovy
+++ b/src/test/groovy/ConstructorTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ConstructorTest extends GroovyTestCase {
 
     public ConstructorTest() { }
diff --git a/src/test/groovy/CurlyBracketLayoutTest.groovy b/src/test/groovy/CurlyBracketLayoutTest.groovy
index 64d8745..d1c0ed7 100644
--- a/src/test/groovy/CurlyBracketLayoutTest.groovy
+++ b/src/test/groovy/CurlyBracketLayoutTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class CurlyBracketLayoutTest extends GroovyTestCase
 {
     void testBracketPlacement()
diff --git a/src/test/groovy/DefaultParamClosureTest.groovy b/src/test/groovy/DefaultParamClosureTest.groovy
index fb90f23..611ac44 100644
--- a/src/test/groovy/DefaultParamClosureTest.groovy
+++ b/src/test/groovy/DefaultParamClosureTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class DefaultParamClosureTest extends GroovyTestCase {
 
     void testDefaultParameters() {
diff --git a/src/test/groovy/DoWhileLoopTest.groovy b/src/test/groovy/DoWhileLoopTest.groovy
index 8dc789f..86d9e06 100644
--- a/src/test/groovy/DoWhileLoopTest.groovy
+++ b/src/test/groovy/DoWhileLoopTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class DoWhileLoopTest extends GroovyTestCase {
 
     void testDoWhileWhile() {
diff --git a/src/test/groovy/DollarEscapingTest.groovy b/src/test/groovy/DollarEscapingTest.groovy
index 7cc4988..05e31d0 100644
--- a/src/test/groovy/DollarEscapingTest.groovy
+++ b/src/test/groovy/DollarEscapingTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class DollarEscapingTest extends GroovyTestCase {
 
     void testEscaping() {
diff --git a/src/test/groovy/DownUpStepTest.groovy b/src/test/groovy/DownUpStepTest.groovy
index f061525..8a58a76 100644
--- a/src/test/groovy/DownUpStepTest.groovy
+++ b/src/test/groovy/DownUpStepTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 public class DownUpStepTest extends GroovyTestCase {
 
     void testDownto() {
diff --git a/src/test/groovy/DynamicMemberTest.groovy b/src/test/groovy/DynamicMemberTest.groovy
index 075029a..5599bd5 100644
--- a/src/test/groovy/DynamicMemberTest.groovy
+++ b/src/test/groovy/DynamicMemberTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class DynamicMemberTest extends GroovyTestCase {
   def aTestMethod(o){o}
   def aProperty
diff --git a/src/test/groovy/EqualsTest.groovy b/src/test/groovy/EqualsTest.groovy
index afe20f4..ee019fb 100644
--- a/src/test/groovy/EqualsTest.groovy
+++ b/src/test/groovy/EqualsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyShellTestCase
+
 class EqualsTest extends GroovyShellTestCase {
 
     void testParentChildrenEquals() {
diff --git a/src/test/groovy/EscapedUnicodeTest.groovy b/src/test/groovy/EscapedUnicodeTest.groovy
index af64aaa..cf92d59 100644
--- a/src/test/groovy/EscapedUnicodeTest.groovy
+++ b/src/test/groovy/EscapedUnicodeTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class EscapedUnicodeTest extends GroovyTestCase {
     void testNothing() {}
 }
diff --git a/src/test/groovy/ExceptionInClosureTest.groovy b/src/test/groovy/ExceptionInClosureTest.groovy
index 42c2690..2d48654 100644
--- a/src/test/groovy/ExceptionInClosureTest.groovy
+++ b/src/test/groovy/ExceptionInClosureTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests exception handling inside of a closure
  */
diff --git a/src/test/groovy/ExpandoPropertyTest.groovy b/src/test/groovy/ExpandoPropertyTest.groovy
index fcd27a0..8d97da8 100644
--- a/src/test/groovy/ExpandoPropertyTest.groovy
+++ b/src/test/groovy/ExpandoPropertyTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ExpandoPropertyTest extends GroovyTestCase {
 
     void testExpandoProperty() {
diff --git a/src/test/groovy/FileTest.groovy b/src/test/groovy/FileTest.groovy
index 9e9fe11..a38d0ea 100644
--- a/src/test/groovy/FileTest.groovy
+++ b/src/test/groovy/FileTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 import static groovy.io.FileType.*
 import static groovy.io.FileVisitResult.*
 
diff --git a/src/test/groovy/FilterLineTest.groovy b/src/test/groovy/FilterLineTest.groovy
index 1611e40..13cce3d 100644
--- a/src/test/groovy/FilterLineTest.groovy
+++ b/src/test/groovy/FilterLineTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * check that the new filterLine() method on InputStream is ok
  * (and indirectly test newReader() method on InputStream)
diff --git a/src/test/groovy/FinallyTest.groovy b/src/test/groovy/FinallyTest.groovy
index 4b785bd..e07cfc5 100644
--- a/src/test/groovy/FinallyTest.groovy
+++ b/src/test/groovy/FinallyTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class FinallyTest extends GroovyTestCase {
 
     void testBreakInTry() {
diff --git a/src/test/groovy/ForLoopWithLocalVariablesTest.groovy b/src/test/groovy/ForLoopWithLocalVariablesTest.groovy
index 7062e2b..647b608 100644
--- a/src/test/groovy/ForLoopWithLocalVariablesTest.groovy
+++ b/src/test/groovy/ForLoopWithLocalVariablesTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests iterating with local variables
  */
diff --git a/src/test/groovy/GStringTest.groovy b/src/test/groovy/GStringTest.groovy
index 5e58e14..d334db9 100644
--- a/src/test/groovy/GStringTest.groovy
+++ b/src/test/groovy/GStringTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class GStringTest extends GroovyTestCase {
 
     void check(template, teststr) {
diff --git a/src/test/groovy/GeneratorTest.groovy b/src/test/groovy/GeneratorTest.groovy
index ac76ac7..369e191 100644
--- a/src/test/groovy/GeneratorTest.groovy
+++ b/src/test/groovy/GeneratorTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class GeneratorTest extends GroovyTestCase {
 
     void testGenerator() {
diff --git a/src/test/groovy/GlobalPrintlnTest.groovy b/src/test/groovy/GlobalPrintlnTest.groovy
index 06ca4ea..21d5701 100644
--- a/src/test/groovy/GlobalPrintlnTest.groovy
+++ b/src/test/groovy/GlobalPrintlnTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class GlobalPrintlnTest extends GroovyTestCase {
 
     void testGlobalPrintln() {
diff --git a/src/test/groovy/GroovyCharSequenceMethodsTest.groovy b/src/test/groovy/GroovyCharSequenceMethodsTest.groovy
index 8dc83e6..e247d5e 100644
--- a/src/test/groovy/GroovyCharSequenceMethodsTest.groovy
+++ b/src/test/groovy/GroovyCharSequenceMethodsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests for DGM methods on CharSequence.
  */
diff --git a/src/test/groovy/GroovyClosureMethodsTest.groovy b/src/test/groovy/GroovyClosureMethodsTest.groovy
index f43a7b5..849a639 100644
--- a/src/test/groovy/GroovyClosureMethodsTest.groovy
+++ b/src/test/groovy/GroovyClosureMethodsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
diff --git a/src/test/groovy/GroovyInterceptableTest.groovy b/src/test/groovy/GroovyInterceptableTest.groovy
index 2817075..a667bc0 100644
--- a/src/test/groovy/GroovyInterceptableTest.groovy
+++ b/src/test/groovy/GroovyInterceptableTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.ReflectionMethodInvoker
 
 class GroovyInterceptableTest extends GroovyTestCase {
diff --git a/src/test/groovy/GroovyMethodsTest.groovy b/src/test/groovy/GroovyMethodsTest.groovy
index dd31077..fcbf3dd 100644
--- a/src/test/groovy/GroovyMethodsTest.groovy
+++ b/src/test/groovy/GroovyMethodsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 import java.awt.Dimension
 import java.nio.CharBuffer
 import java.util.concurrent.LinkedBlockingQueue
diff --git a/src/test/groovy/GroovyTruthTest.groovy b/src/test/groovy/GroovyTruthTest.groovy
index e602125..f23e324 100644
--- a/src/test/groovy/GroovyTruthTest.groovy
+++ b/src/test/groovy/GroovyTruthTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class GroovyTruthTest extends GroovyTestCase {
 
     void testTruth() {
diff --git a/src/test/groovy/HeredocsTest.groovy b/src/test/groovy/HeredocsTest.groovy
index dbdb4c7..66b08dd 100644
--- a/src/test/groovy/HeredocsTest.groovy
+++ b/src/test/groovy/HeredocsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class HeredocsTest extends GroovyTestCase {
 
     void testHeredocs() {
diff --git a/src/test/groovy/HexTest.groovy b/src/test/groovy/HexTest.groovy
index aa76b5d..c97fea5 100644
--- a/src/test/groovy/HexTest.groovy
+++ b/src/test/groovy/HexTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test cases for encodeHex methods in DefaultGroovyMethods
  */
diff --git a/src/test/groovy/HomepageTest.groovy b/src/test/groovy/HomepageTest.groovy
index 57a1f81..676e56d 100644
--- a/src/test/groovy/HomepageTest.groovy
+++ b/src/test/groovy/HomepageTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class HomepageTest extends GroovyTestCase {
 
     void testHomePage() {
diff --git a/src/test/groovy/IdentityClosureTest.groovy b/src/test/groovy/IdentityClosureTest.groovy
index 65599b8..8431e31 100644
--- a/src/test/groovy/IdentityClosureTest.groovy
+++ b/src/test/groovy/IdentityClosureTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Check that Object.identity(Closure) method works as expected
  */
diff --git a/src/test/groovy/IfElseCompactTest.groovy b/src/test/groovy/IfElseCompactTest.groovy
index c3cbdf1..1c3b67b 100644
--- a/src/test/groovy/IfElseCompactTest.groovy
+++ b/src/test/groovy/IfElseCompactTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class IfElseCompactTest extends GroovyTestCase {
 
     void testIf_NoElse() {
diff --git a/src/test/groovy/IfElseTest.groovy b/src/test/groovy/IfElseTest.groovy
index 63fbcf2..d050678 100644
--- a/src/test/groovy/IfElseTest.groovy
+++ b/src/test/groovy/IfElseTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class IfElseTest extends GroovyTestCase {
 
     void testIf_NoElse() {
diff --git a/src/test/groovy/IfPropertyTest.groovy b/src/test/groovy/IfPropertyTest.groovy
index 820a305..3172f59 100644
--- a/src/test/groovy/IfPropertyTest.groovy
+++ b/src/test/groovy/IfPropertyTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class IfPropertyTest extends GroovyTestCase {
 
     def dummy
diff --git a/src/test/groovy/IfTest.groovy b/src/test/groovy/IfTest.groovy
index c742260..2e24e8d 100644
--- a/src/test/groovy/IfTest.groovy
+++ b/src/test/groovy/IfTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class IfTest extends GroovyTestCase {
 
     void testUsingNumber() {
diff --git a/src/test/groovy/IfWithMethodCallTest.groovy b/src/test/groovy/IfWithMethodCallTest.groovy
index 77c4b58..8f3574a 100644
--- a/src/test/groovy/IfWithMethodCallTest.groovy
+++ b/src/test/groovy/IfWithMethodCallTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class IfWithMethodCallTest extends GroovyTestCase {
 
     void testIfWithMethodCall() {
diff --git a/src/test/groovy/IllegalAccessScenariosTest.groovy b/src/test/groovy/IllegalAccessScenariosTest.groovy
index 44096b0..cc1db54 100644
--- a/src/test/groovy/IllegalAccessScenariosTest.groovy
+++ b/src/test/groovy/IllegalAccessScenariosTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 import static groovy.test.GroovyAssert.isAtLeastJdk
 import static org.apache.groovy.util.SystemUtil.getBooleanSafe
 
diff --git a/src/test/groovy/ImportTest.groovy b/src/test/groovy/ImportTest.groovy
index 8eda3b9..bece387 100644
--- a/src/test/groovy/ImportTest.groovy
+++ b/src/test/groovy/ImportTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ImportTest extends GroovyTestCase {
 
     void testImportAll() {
diff --git a/src/test/groovy/InstanceofTest.groovy b/src/test/groovy/InstanceofTest.groovy
index 262d846..301852a 100644
--- a/src/test/groovy/InstanceofTest.groovy
+++ b/src/test/groovy/InstanceofTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class InstanceofTest extends GroovyTestCase {
 
     void testTrue() {
diff --git a/src/test/groovy/InvokeNormalMethodsFirstTest.groovy b/src/test/groovy/InvokeNormalMethodsFirstTest.groovy
index c3a179a..d624bc5 100644
--- a/src/test/groovy/InvokeNormalMethodsFirstTest.groovy
+++ b/src/test/groovy/InvokeNormalMethodsFirstTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Invoke normal methods first: if no statically typed method exist, use invokeMethod().
  */
diff --git a/src/test/groovy/KeywordsInPropertyNamesTest.groovy b/src/test/groovy/KeywordsInPropertyNamesTest.groovy
index 12fdde7..b2fe103 100644
--- a/src/test/groovy/KeywordsInPropertyNamesTest.groovy
+++ b/src/test/groovy/KeywordsInPropertyNamesTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class KeywordsInPropertyNamesTest extends GroovyTestCase {
 
     void testKeywords() {
diff --git a/src/test/groovy/LeftShiftTest.groovy b/src/test/groovy/LeftShiftTest.groovy
index fef784c..94926af 100644
--- a/src/test/groovy/LeftShiftTest.groovy
+++ b/src/test/groovy/LeftShiftTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class LeftShiftTest extends GroovyTestCase {
 
     def foo = [1, 2, 3]
diff --git a/src/test/groovy/ListIteratingTest.groovy b/src/test/groovy/ListIteratingTest.groovy
index c553e28..0f48c43 100644
--- a/src/test/groovy/ListIteratingTest.groovy
+++ b/src/test/groovy/ListIteratingTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /** 
  * Tests iterating using Groovy
  */
diff --git a/src/test/groovy/ListTest.groovy b/src/test/groovy/ListTest.groovy
index 08fcb77..5e3860d 100644
--- a/src/test/groovy/ListTest.groovy
+++ b/src/test/groovy/ListTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
 import groovy.transform.TypeChecked
 
 class ListTest extends GroovyTestCase {
diff --git a/src/test/groovy/LiteralTypesTest.groovy b/src/test/groovy/LiteralTypesTest.groovy
index 4a792cd..454db9c 100644
--- a/src/test/groovy/LiteralTypesTest.groovy
+++ b/src/test/groovy/LiteralTypesTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test numeric literal types (with and without suffixes)
  * @see org.codehaus.groovy.syntax.parser/ASTBuilder#createIntegralNumber()
diff --git a/src/test/groovy/LittleClosureTest.groovy b/src/test/groovy/LittleClosureTest.groovy
index 09c5195..108dada 100644
--- a/src/test/groovy/LittleClosureTest.groovy
+++ b/src/test/groovy/LittleClosureTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class LittleClosureTest extends GroovyTestCase {
 
     void testClosure() {
diff --git a/src/test/groovy/LocalFieldTest.groovy b/src/test/groovy/LocalFieldTest.groovy
index e3ec53d..332e8f8 100644
--- a/src/test/groovy/LocalFieldTest.groovy
+++ b/src/test/groovy/LocalFieldTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class LocalFieldTest extends GroovyTestCase {
 
     private def x
diff --git a/src/test/groovy/LocalPropertyTest.groovy b/src/test/groovy/LocalPropertyTest.groovy
index ca4d512..bc34ac8 100644
--- a/src/test/groovy/LocalPropertyTest.groovy
+++ b/src/test/groovy/LocalPropertyTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class LocalPropertyTest extends GroovyTestCase {
 
     def x
diff --git a/src/test/groovy/LocalVariableTest.groovy b/src/test/groovy/LocalVariableTest.groovy
index 8910586..a4666ae 100644
--- a/src/test/groovy/LocalVariableTest.groovy
+++ b/src/test/groovy/LocalVariableTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class LocalVariableTest extends GroovyTestCase {
 
     void testAssert() {
diff --git a/src/test/groovy/LogicTest.groovy b/src/test/groovy/LogicTest.groovy
index 7fac05f..b303c59 100644
--- a/src/test/groovy/LogicTest.groovy
+++ b/src/test/groovy/LogicTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class LogicTest extends GroovyTestCase {
 
     void testAndWithTrue() {
diff --git a/src/test/groovy/LoopBreakTest.groovy b/src/test/groovy/LoopBreakTest.groovy
index 550c81f..a3fd5a9 100644
--- a/src/test/groovy/LoopBreakTest.groovy
+++ b/src/test/groovy/LoopBreakTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class LoopBreakTest extends GroovyTestCase {
 
     void testWhileWithBreak() {
diff --git a/src/test/groovy/MapConstructionTest.groovy b/src/test/groovy/MapConstructionTest.groovy
index 07ba975..0b1bec5 100644
--- a/src/test/groovy/MapConstructionTest.groovy
+++ b/src/test/groovy/MapConstructionTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /** 
  * Tests creating Maps in Groovy
  */
diff --git a/src/test/groovy/MapPropertyTest.groovy b/src/test/groovy/MapPropertyTest.groovy
index 2762721..64f51ef 100644
--- a/src/test/groovy/MapPropertyTest.groovy
+++ b/src/test/groovy/MapPropertyTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class MapPropertyTest extends GroovyTestCase {
 
     void testGetAndSetProperties() {
diff --git a/src/test/groovy/MapTest.groovy b/src/test/groovy/MapTest.groovy
index d0bbf3d..1cfd268 100644
--- a/src/test/groovy/MapTest.groovy
+++ b/src/test/groovy/MapTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class MapTest extends GroovyTestCase {
 
     void testMap() {
diff --git a/src/test/groovy/MethodCallTest.groovy b/src/test/groovy/MethodCallTest.groovy
index b485b48..1a9afc1 100644
--- a/src/test/groovy/MethodCallTest.groovy
+++ b/src/test/groovy/MethodCallTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class MethodCallTest extends GroovyTestCase {
 
     void testMethodCall() {
diff --git a/src/test/groovy/MethodCallWithoutParenthesisTest.groovy b/src/test/groovy/MethodCallWithoutParenthesisTest.groovy
index 233d17c..af2dbed 100644
--- a/src/test/groovy/MethodCallWithoutParenthesisTest.groovy
+++ b/src/test/groovy/MethodCallWithoutParenthesisTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class MethodCallWithoutParenthesisTest extends GroovyTestCase {
 
     def flag
diff --git a/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy b/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy
index 60d125f..94c3c8e 100644
--- a/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy
+++ b/src/test/groovy/MethodParameterAccessWithinClosureTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * To test access to method scoped variable within closure
  */
diff --git a/src/test/groovy/MinMaxTest.groovy b/src/test/groovy/MinMaxTest.groovy
index a11a87a..20f3abf 100644
--- a/src/test/groovy/MinMaxTest.groovy
+++ b/src/test/groovy/MinMaxTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests the min() and max() functions
  */
diff --git a/src/test/groovy/MinusEqualsTest.groovy b/src/test/groovy/MinusEqualsTest.groovy
index 2a07f89..c74690c 100644
--- a/src/test/groovy/MinusEqualsTest.groovy
+++ b/src/test/groovy/MinusEqualsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class MinusEqualsTest extends GroovyTestCase {
 
     void testIntegerMinusEquals() {
diff --git a/src/test/groovy/ModuloTest.groovy b/src/test/groovy/ModuloTest.groovy
index 067bb51..3830197 100644
--- a/src/test/groovy/ModuloTest.groovy
+++ b/src/test/groovy/ModuloTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ModuloTest extends GroovyTestCase {
   int modulo = 100
 
diff --git a/src/test/groovy/MultiCatchTest.groovy b/src/test/groovy/MultiCatchTest.groovy
index 0a1ecb9..7c17550 100644
--- a/src/test/groovy/MultiCatchTest.groovy
+++ b/src/test/groovy/MultiCatchTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.control.ParserPluginFactory
 
diff --git a/src/test/groovy/MultiDimArraysTest.groovy b/src/test/groovy/MultiDimArraysTest.groovy
index 4327432..8e2d22d 100644
--- a/src/test/groovy/MultiDimArraysTest.groovy
+++ b/src/test/groovy/MultiDimArraysTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Expose how to deal with multi-dimensional Arrays until this is supported at the language level.
  */
diff --git a/src/test/groovy/MultilineChainExpressionTest.groovy b/src/test/groovy/MultilineChainExpressionTest.groovy
index 9a1199b..9fb8e87 100644
--- a/src/test/groovy/MultilineChainExpressionTest.groovy
+++ b/src/test/groovy/MultilineChainExpressionTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class MultilineChainExpressionTest extends GroovyTestCase {
     void testMultiLineChain() {
         // the code below should be compilable
diff --git a/src/test/groovy/MultilineStringTest.groovy b/src/test/groovy/MultilineStringTest.groovy
index f3ba72e..e67f6a1 100644
--- a/src/test/groovy/MultilineStringTest.groovy
+++ b/src/test/groovy/MultilineStringTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class MultilineStringTest extends GroovyTestCase {
 
     void testMultilineString() {
diff --git a/src/test/groovy/MultiplyDivideEqualsTest.groovy b/src/test/groovy/MultiplyDivideEqualsTest.groovy
index 6d291ae..edfd25f 100644
--- a/src/test/groovy/MultiplyDivideEqualsTest.groovy
+++ b/src/test/groovy/MultiplyDivideEqualsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class MultiplyDivideEqualsTest extends GroovyTestCase {
 
     void testIntegerMultiplyEquals() {
diff --git a/src/test/groovy/NamedParameterTest.groovy b/src/test/groovy/NamedParameterTest.groovy
index b0cc07b..4ff1553 100644
--- a/src/test/groovy/NamedParameterTest.groovy
+++ b/src/test/groovy/NamedParameterTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
 import groovy.transform.NamedParam
 import groovy.transform.NamedParams
 import groovy.transform.TypeChecked
diff --git a/src/test/groovy/NestedClassTest.groovy b/src/test/groovy/NestedClassTest.groovy
index ae63440..e17d8c9 100644
--- a/src/test/groovy/NestedClassTest.groovy
+++ b/src/test/groovy/NestedClassTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class NestedClassTest extends GroovyTestCase {
 
     void testStaticInnerStaticMethod () {
diff --git a/src/test/groovy/NullPropertyTest.groovy b/src/test/groovy/NullPropertyTest.groovy
index 7e59c80..77157f4 100644
--- a/src/test/groovy/NullPropertyTest.groovy
+++ b/src/test/groovy/NullPropertyTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class NullPropertyTest extends GroovyTestCase {
     def wensleydale = null
 
diff --git a/src/test/groovy/OptionalReturnTest.groovy b/src/test/groovy/OptionalReturnTest.groovy
index 2ef4ffa..2e3d9b3 100644
--- a/src/test/groovy/OptionalReturnTest.groovy
+++ b/src/test/groovy/OptionalReturnTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class OptionalReturnTest extends GroovyTestCase {
 
     def y
diff --git a/src/test/groovy/OverloadInvokeMethodTest.groovy b/src/test/groovy/OverloadInvokeMethodTest.groovy
index fc29a78..601a94d 100644
--- a/src/test/groovy/OverloadInvokeMethodTest.groovy
+++ b/src/test/groovy/OverloadInvokeMethodTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class OverloadInvokeMethodTest extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/OverridePropertyGetterTest.groovy b/src/test/groovy/OverridePropertyGetterTest.groovy
index 70c1c3d..d296f37 100644
--- a/src/test/groovy/OverridePropertyGetterTest.groovy
+++ b/src/test/groovy/OverridePropertyGetterTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * test to ensure that overriding getter doesn't throw a NPE on access
  */
diff --git a/src/test/groovy/OverrideTest.groovy b/src/test/groovy/OverrideTest.groovy
index 9740d16..b510838 100644
--- a/src/test/groovy/OverrideTest.groovy
+++ b/src/test/groovy/OverrideTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class OverrideTest extends GroovyTestCase {
     void testHappyPath() {
         assertScript """
diff --git a/src/test/groovy/PlusEqualsTest.groovy b/src/test/groovy/PlusEqualsTest.groovy
index 99c27da..1fec88f 100644
--- a/src/test/groovy/PlusEqualsTest.groovy
+++ b/src/test/groovy/PlusEqualsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class PlusEqualsTest extends GroovyTestCase {
 
     void testIntegerPlusEquals() {
diff --git a/src/test/groovy/PostfixTest.groovy b/src/test/groovy/PostfixTest.groovy
index 920dcd1..f52a00d 100644
--- a/src/test/groovy/PostfixTest.groovy
+++ b/src/test/groovy/PostfixTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class PostfixTest extends GroovyTestCase {
 
     void testIntegerPostfix() {
diff --git a/src/test/groovy/PrefixTest.groovy b/src/test/groovy/PrefixTest.groovy
index f1ef264..9ce8d7a 100644
--- a/src/test/groovy/PrefixTest.groovy
+++ b/src/test/groovy/PrefixTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class PrefixTest extends GroovyTestCase {
 
     void testIntegerPrefix() {
diff --git a/src/test/groovy/PrimitiveArraysTest.groovy b/src/test/groovy/PrimitiveArraysTest.groovy
index 6cf502e..2143846 100644
--- a/src/test/groovy/PrimitiveArraysTest.groovy
+++ b/src/test/groovy/PrimitiveArraysTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class PrimitiveArraysTest extends GroovyTestCase {
 
     def c1Field = [] as char[]
diff --git a/src/test/groovy/PrimitiveDefaultValueTest.groovy b/src/test/groovy/PrimitiveDefaultValueTest.groovy
index af84f3b..bd8d21b 100644
--- a/src/test/groovy/PrimitiveDefaultValueTest.groovy
+++ b/src/test/groovy/PrimitiveDefaultValueTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test for non-initialized fields or variables of the primitive types.
  */
diff --git a/src/test/groovy/PrimitiveTypeFieldTest.groovy b/src/test/groovy/PrimitiveTypeFieldTest.groovy
index 1b9f752..1374c3a 100644
--- a/src/test/groovy/PrimitiveTypeFieldTest.groovy
+++ b/src/test/groovy/PrimitiveTypeFieldTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class PrimitiveTypeFieldTest extends GroovyTestCase {
     private long longField
     private static short shortField
diff --git a/src/test/groovy/PrimitiveTypesTest.groovy b/src/test/groovy/PrimitiveTypesTest.groovy
index 15cf1b7..e147d7f 100644
--- a/src/test/groovy/PrimitiveTypesTest.groovy
+++ b/src/test/groovy/PrimitiveTypesTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class PrimitiveTypesTest extends GroovyTestCase {
 
     int getInt() {
diff --git a/src/test/groovy/PrintTest.groovy b/src/test/groovy/PrintTest.groovy
index 518115e..53c3656 100644
--- a/src/test/groovy/PrintTest.groovy
+++ b/src/test/groovy/PrintTest.groovy
@@ -19,6 +19,7 @@
 package groovy
 
 import groovy.io.GroovyPrintStream
+import groovy.test.GroovyTestCase
 
 import java.text.NumberFormat
 
diff --git a/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy b/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy
index a78c054..848dfd1 100644
--- a/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy
+++ b/src/test/groovy/PrivateVariableAccessFromAnotherInstanceTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * test to ensure that private instance variables are visible to 
  * other instance variables of the same class
diff --git a/src/test/groovy/ProcessTest.groovy b/src/test/groovy/ProcessTest.groovy
index 0f75a99..1fe048d 100644
--- a/src/test/groovy/ProcessTest.groovy
+++ b/src/test/groovy/ProcessTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * check that groovy Process methods do their job.
  */
diff --git a/src/test/groovy/Property2Test.groovy b/src/test/groovy/Property2Test.groovy
index 130fb32..152657e 100644
--- a/src/test/groovy/Property2Test.groovy
+++ b/src/test/groovy/Property2Test.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests the use of getMetaPropertyValues() and getProperties() for Beans and Expandos.
  */
diff --git a/src/test/groovy/PropertyTest.groovy b/src/test/groovy/PropertyTest.groovy
index 2cf74f1..39dafd0 100644
--- a/src/test/groovy/PropertyTest.groovy
+++ b/src/test/groovy/PropertyTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests the use of properties in Groovy
  */
diff --git a/src/test/groovy/PropertyWithoutDotTest.groovy b/src/test/groovy/PropertyWithoutDotTest.groovy
index b22b60c..c762e66 100644
--- a/src/test/groovy/PropertyWithoutDotTest.groovy
+++ b/src/test/groovy/PropertyWithoutDotTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class PropertyWithoutDotTest extends GroovyTestCase {
     def getFoo() {
         return "cheese"
diff --git a/src/test/groovy/RangeTest.groovy b/src/test/groovy/RangeTest.groovy
index cba8443..dc2cb45 100644
--- a/src/test/groovy/RangeTest.groovy
+++ b/src/test/groovy/RangeTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class RangeTest extends GroovyTestCase {
 
     void testRange() {
diff --git a/src/test/groovy/ReadLineTest.groovy b/src/test/groovy/ReadLineTest.groovy
index 4d56367..3c93201 100644
--- a/src/test/groovy/ReadLineTest.groovy
+++ b/src/test/groovy/ReadLineTest.groovy
@@ -19,6 +19,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test to ensure that readLine() method works on Reader/InputStream
  */
diff --git a/src/test/groovy/RegularExpressionsTest.groovy b/src/test/groovy/RegularExpressionsTest.groovy
index 7d5d08a..45f93b1 100644
--- a/src/test/groovy/RegularExpressionsTest.groovy
+++ b/src/test/groovy/RegularExpressionsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
diff --git a/src/test/groovy/ReturnTest.groovy b/src/test/groovy/ReturnTest.groovy
index 9d1c385..48defbe 100644
--- a/src/test/groovy/ReturnTest.groovy
+++ b/src/test/groovy/ReturnTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests the use of returns in Groovy
  */
diff --git a/src/test/groovy/SafeNavigationTest.groovy b/src/test/groovy/SafeNavigationTest.groovy
index d0dd7cf..a184123 100644
--- a/src/test/groovy/SafeNavigationTest.groovy
+++ b/src/test/groovy/SafeNavigationTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class SafeNavigationTest extends GroovyTestCase {
 
     void testNullNavigation() {
diff --git a/src/test/groovy/SerializeTest.groovy b/src/test/groovy/SerializeTest.groovy
index 18dec6d..c98d93c 100644
--- a/src/test/groovy/SerializeTest.groovy
+++ b/src/test/groovy/SerializeTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class SerializeTest extends GroovyTestCase {
 
     void testGString () {
diff --git a/src/test/groovy/SetTest.groovy b/src/test/groovy/SetTest.groovy
index 623bd66..4f8f1d1 100644
--- a/src/test/groovy/SetTest.groovy
+++ b/src/test/groovy/SetTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class SetTest extends GroovyTestCase {
 
     void testSetPlus() {
diff --git a/src/test/groovy/ShellTest.groovy b/src/test/groovy/ShellTest.groovy
index 1c978e7..84545ad 100644
--- a/src/test/groovy/ShellTest.groovy
+++ b/src/test/groovy/ShellTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ShellTest extends GroovyTestCase {
 
     void testReadAndWriteVariable() {
diff --git a/src/test/groovy/SimplePostfixTest.groovy b/src/test/groovy/SimplePostfixTest.groovy
index 781fcb7..66e3364 100644
--- a/src/test/groovy/SimplePostfixTest.groovy
+++ b/src/test/groovy/SimplePostfixTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class SimplePostfixTest extends GroovyTestCase {
 
     void testPostfix() {
diff --git a/src/test/groovy/SingletonBugTest.groovy b/src/test/groovy/SingletonBugTest.groovy
index f06c20c..20ffcfc 100644
--- a/src/test/groovy/SingletonBugTest.groovy
+++ b/src/test/groovy/SingletonBugTest.groovy
@@ -17,6 +17,9 @@
  *  under the License.
  */
 package groovy
+
+import groovy.test.GroovyTestCase
+
 // GROOVY-435
 
 class SingletonBugTest extends GroovyTestCase {
diff --git a/src/test/groovy/SliceTest.groovy b/src/test/groovy/SliceTest.groovy
index ac5ea31..9dfaffc 100644
--- a/src/test/groovy/SliceTest.groovy
+++ b/src/test/groovy/SliceTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class SliceTest extends GroovyTestCase {
 
     void testListSlice() {
diff --git a/src/test/groovy/SocketTest.groovy b/src/test/groovy/SocketTest.groovy
index a426188..cf52589 100644
--- a/src/test/groovy/SocketTest.groovy
+++ b/src/test/groovy/SocketTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * check that groovy Socket methods do their job.
  */
diff --git a/src/test/groovy/SortTest.groovy b/src/test/groovy/SortTest.groovy
index 90962b9..a5fa742 100644
--- a/src/test/groovy/SortTest.groovy
+++ b/src/test/groovy/SortTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class SortTest extends GroovyTestCase {
 
     // GROOVY-1956
diff --git a/src/test/groovy/SpreadDotTest.groovy b/src/test/groovy/SpreadDotTest.groovy
index 7f0c6a9..7574752 100644
--- a/src/test/groovy/SpreadDotTest.groovy
+++ b/src/test/groovy/SpreadDotTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test for the spread dot operator "*.".
  *
diff --git a/src/test/groovy/SqlDateTest.groovy b/src/test/groovy/SqlDateTest.groovy
index 1bbac3d..bca02ae 100644
--- a/src/test/groovy/SqlDateTest.groovy
+++ b/src/test/groovy/SqlDateTest.groovy
@@ -16,8 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy;
+package groovy
 
+import groovy.test.GroovyTestCase;
 import groovy.time.TimeCategory
 
 class SqlDateTest extends GroovyTestCase {
diff --git a/src/test/groovy/StackTraceTest.groovy b/src/test/groovy/StackTraceTest.groovy
index 0a83142..9e4c2ba 100644
--- a/src/test/groovy/StackTraceTest.groovy
+++ b/src/test/groovy/StackTraceTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * This test case is added to ensure an exception thrown from inside
  * groovy does always contain a valid line number and file name for
diff --git a/src/test/groovy/StaticMessageTest.groovy b/src/test/groovy/StaticMessageTest.groovy
index 4a84bed..e6f73d2 100755
--- a/src/test/groovy/StaticMessageTest.groovy
+++ b/src/test/groovy/StaticMessageTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class StaticMessageTest extends GroovyTestCase {
 
    void testStaticMissingMethodException() {
diff --git a/src/test/groovy/StringBufferTest.groovy b/src/test/groovy/StringBufferTest.groovy
index 976a703..8d862a4 100644
--- a/src/test/groovy/StringBufferTest.groovy
+++ b/src/test/groovy/StringBufferTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class StringBufferTest extends GroovyTestCase {
     void testSize() {
         def x = new StringBuffer()
diff --git a/src/test/groovy/StringTest.groovy b/src/test/groovy/StringTest.groovy
index a8cc253..40ce071 100644
--- a/src/test/groovy/StringTest.groovy
+++ b/src/test/groovy/StringTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * Various tests for Strings.
  */
diff --git a/src/test/groovy/SubscriptTest.groovy b/src/test/groovy/SubscriptTest.groovy
index b316334..9d2d30c 100644
--- a/src/test/groovy/SubscriptTest.groovy
+++ b/src/test/groovy/SubscriptTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class SubscriptTest extends GroovyTestCase {
 
     void testListRange() {
diff --git a/src/test/groovy/SwitchTest.groovy b/src/test/groovy/SwitchTest.groovy
index 2aba958..89cc170 100644
--- a/src/test/groovy/SwitchTest.groovy
+++ b/src/test/groovy/SwitchTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class SwitchTest extends GroovyTestCase {
 
     void testSwitch() {
diff --git a/src/test/groovy/SwitchWithDifferentTypesTest.groovy b/src/test/groovy/SwitchWithDifferentTypesTest.groovy
index e1968b8..4026733 100644
--- a/src/test/groovy/SwitchWithDifferentTypesTest.groovy
+++ b/src/test/groovy/SwitchWithDifferentTypesTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * A test case for switch statement with different types
  */
diff --git a/src/test/groovy/TextPropertyTest.groovy b/src/test/groovy/TextPropertyTest.groovy
index 3f307de..bbf0ac6 100644
--- a/src/test/groovy/TextPropertyTest.groovy
+++ b/src/test/groovy/TextPropertyTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * check that text def is available on...
  *
diff --git a/src/test/groovy/ThisAndSuperTest.groovy b/src/test/groovy/ThisAndSuperTest.groovy
index 8a865a0..087756d 100644
--- a/src/test/groovy/ThisAndSuperTest.groovy
+++ b/src/test/groovy/ThisAndSuperTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ThisAndSuperTest extends GroovyTestCase {
     void testOverwrittenSuperMethod() {
         def helper = new TestForSuperHelper2()
diff --git a/src/test/groovy/ThreadMethodsTest.groovy b/src/test/groovy/ThreadMethodsTest.groovy
index a19a6c5..2139612 100644
--- a/src/test/groovy/ThreadMethodsTest.groovy
+++ b/src/test/groovy/ThreadMethodsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 import java.util.concurrent.CyclicBarrier
 import java.util.concurrent.TimeUnit
 
diff --git a/src/test/groovy/ThrowTest.groovy b/src/test/groovy/ThrowTest.groovy
index b67c21c..e0d6ae0 100644
--- a/src/test/groovy/ThrowTest.groovy
+++ b/src/test/groovy/ThrowTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ThrowTest extends GroovyTestCase {
     void testThrow() {
         try {
diff --git a/src/test/groovy/ToArrayBugTest.groovy b/src/test/groovy/ToArrayBugTest.groovy
index 0e31c9f..eb06ef6 100644
--- a/src/test/groovy/ToArrayBugTest.groovy
+++ b/src/test/groovy/ToArrayBugTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ToArrayBugTest extends GroovyTestCase {
     
     void testToArrayBug() {
diff --git a/src/test/groovy/TripleQuotedStringTest.groovy b/src/test/groovy/TripleQuotedStringTest.groovy
index dec8a11..49cd4dc 100644
--- a/src/test/groovy/TripleQuotedStringTest.groovy
+++ b/src/test/groovy/TripleQuotedStringTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class TripleQuotedStringTest extends GroovyTestCase {
 
     void testTripleQuotedString() {
diff --git a/src/test/groovy/TypesafeMethodTest.groovy b/src/test/groovy/TypesafeMethodTest.groovy
index f2fbb5d..37653df 100644
--- a/src/test/groovy/TypesafeMethodTest.groovy
+++ b/src/test/groovy/TypesafeMethodTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class TypesafeMethodTest extends GroovyTestCase {
 
     void testTypesafeMethod() {
diff --git a/src/test/groovy/UniqueOnCollectionTest.groovy b/src/test/groovy/UniqueOnCollectionTest.groovy
index f8de13c..81594b7 100644
--- a/src/test/groovy/UniqueOnCollectionTest.groovy
+++ b/src/test/groovy/UniqueOnCollectionTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class UniqueOnCollectionTest extends GroovyTestCase {
 
     void testUnique() {
diff --git a/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy b/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy
index ea7b4d5..69b8c0a 100644
--- a/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy
+++ b/src/test/groovy/UniqueOnCollectionWithClosureTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class UniqueOnCollectionWithClosureTest extends GroovyTestCase {
 
     void testUniqueOnIterator() {
diff --git a/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy b/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy
index f8b5eed..8dca42b 100644
--- a/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy
+++ b/src/test/groovy/UniqueOnCollectionWithComparatorTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class UniqueOnCollectionWithComparatorTest extends GroovyTestCase {
 
     void testUniqueOnIterator() {
diff --git a/src/test/groovy/UnsafeNavigationTest.groovy b/src/test/groovy/UnsafeNavigationTest.groovy
index d77542d..7a583c0 100644
--- a/src/test/groovy/UnsafeNavigationTest.groovy
+++ b/src/test/groovy/UnsafeNavigationTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class UnsafeNavigationTest extends GroovyTestCase {
 
     void testUnsafePropertyNavigations() {
diff --git a/src/test/groovy/VArgsTest.groovy b/src/test/groovy/VArgsTest.groovy
index eb0d3c7..3a7dd29 100644
--- a/src/test/groovy/VArgsTest.groovy
+++ b/src/test/groovy/VArgsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class VArgsTest extends GroovyTestCase {
 
   def primitiveMethod(){0}
diff --git a/src/test/groovy/ValidNameTest.groovy b/src/test/groovy/ValidNameTest.groovy
index db33a92..24e08fd 100644
--- a/src/test/groovy/ValidNameTest.groovy
+++ b/src/test/groovy/ValidNameTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class ValidNameTest extends GroovyTestCase {
 
     void testFieldNamesWithDollar() {
diff --git a/src/test/groovy/VarargsMethodTest.groovy b/src/test/groovy/VarargsMethodTest.groovy
index b3a2d1a..6e04a3b 100644
--- a/src/test/groovy/VarargsMethodTest.groovy
+++ b/src/test/groovy/VarargsMethodTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 /**
  * VarargsMethodTest.groovy
  *
diff --git a/src/test/groovy/VerbatimGStringTest.groovy b/src/test/groovy/VerbatimGStringTest.groovy
index 13e9d4a..af2633f 100644
--- a/src/test/groovy/VerbatimGStringTest.groovy
+++ b/src/test/groovy/VerbatimGStringTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class VerbatimGStringTest extends GroovyTestCase {
 
     void testWithOneVariable() {
diff --git a/src/test/groovy/WhileLoopTest.groovy b/src/test/groovy/WhileLoopTest.groovy
index a63e6cc..e59f318 100644
--- a/src/test/groovy/WhileLoopTest.groovy
+++ b/src/test/groovy/WhileLoopTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy
 
+import groovy.test.GroovyTestCase
+
 class WhileLoopTest extends GroovyTestCase {
 
     void testVerySimpleWhile() {
diff --git a/src/test/groovy/annotations/PackageAndImportAnnotationTest.groovy b/src/test/groovy/annotations/PackageAndImportAnnotationTest.groovy
index cfeac15..9dc7932 100644
--- a/src/test/groovy/annotations/PackageAndImportAnnotationTest.groovy
+++ b/src/test/groovy/annotations/PackageAndImportAnnotationTest.groovy
@@ -32,7 +32,7 @@ final class PackageAndImportAnnotationTest {
             def x = new groovy.annotations.MyClass()
             assert x.class.annotations[0].value() == 60
             assert x.class.package.annotations[0].value() == 30
-            new AntBuilder().with {
+            new groovy.ant.AntBuilder().with {
                 mkdir(dir:'temp')
                 delete(file:'temp/log.txt')
                 taskdef(name:'groovyc', classname:'org.codehaus.groovy.ant.Groovyc')
diff --git a/src/test/groovy/annotations/ParameterAnnotationTest.groovy b/src/test/groovy/annotations/ParameterAnnotationTest.groovy
index 69cdf8d..db93ac9 100644
--- a/src/test/groovy/annotations/ParameterAnnotationTest.groovy
+++ b/src/test/groovy/annotations/ParameterAnnotationTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.annotations
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.*
 
 class ParameterAnnotationTest extends GroovyTestCase {
diff --git a/src/test/groovy/beans/BindableTransformTest.groovy b/src/test/groovy/beans/BindableTransformTest.groovy
index a91fbb4..11f8228 100644
--- a/src/test/groovy/beans/BindableTransformTest.groovy
+++ b/src/test/groovy/beans/BindableTransformTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.beans
 
+import groovy.test.GroovyShellTestCase
 import org.codehaus.groovy.control.CompilationFailedException
 
 import java.beans.PropertyChangeListener
diff --git a/src/test/groovy/beans/ListenerListTransformTest.groovy b/src/test/groovy/beans/ListenerListTransformTest.groovy
index 93e5ed1..d7f09cc 100644
--- a/src/test/groovy/beans/ListenerListTransformTest.groovy
+++ b/src/test/groovy/beans/ListenerListTransformTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.beans
 
+import groovy.test.GroovyTestCase
+
 /**
  * Unit test for ListenerList.
  */
diff --git a/src/test/groovy/beans/VetoableTransformTest.groovy b/src/test/groovy/beans/VetoableTransformTest.groovy
index 3fce996..c9ad62e 100644
--- a/src/test/groovy/beans/VetoableTransformTest.groovy
+++ b/src/test/groovy/beans/VetoableTransformTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.beans
 
+import groovy.test.GroovyShellTestCase
 import org.codehaus.groovy.control.CompilationFailedException
 
 class VetoableTransformTest extends GroovyShellTestCase {
diff --git a/src/test/groovy/bugs/AmbiguousListOrMethodTest.groovy b/src/test/groovy/bugs/AmbiguousListOrMethodTest.groovy
index 76f7eb7..65ca0ba 100644
--- a/src/test/groovy/bugs/AmbiguousListOrMethodTest.groovy
+++ b/src/test/groovy/bugs/AmbiguousListOrMethodTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class AmbiguousListOrMethodTest extends GroovyTestCase {
 
     void testLocalVariableVersion() {
diff --git a/src/test/groovy/bugs/AsBoolBug.groovy b/src/test/groovy/bugs/AsBoolBug.groovy
index bfc6b29..c45e990 100644
--- a/src/test/groovy/bugs/AsBoolBug.groovy
+++ b/src/test/groovy/bugs/AsBoolBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test to fix the Jira issues GROOVY-810 and GROOVY-811.
  * Test of "string as Boolean" against the issue GROOVY-812.
diff --git a/src/test/groovy/bugs/AssignmentInsideExpressionBug.groovy b/src/test/groovy/bugs/AssignmentInsideExpressionBug.groovy
index 8eaf28a..772a81c 100644
--- a/src/test/groovy/bugs/AssignmentInsideExpressionBug.groovy
+++ b/src/test/groovy/bugs/AssignmentInsideExpressionBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class AssignmentInsideExpressionBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/AttributeSetExpressionBug.groovy b/src/test/groovy/bugs/AttributeSetExpressionBug.groovy
index 40fdded..bfea7fe 100644
--- a/src/test/groovy/bugs/AttributeSetExpressionBug.groovy
+++ b/src/test/groovy/bugs/AttributeSetExpressionBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class AttributeSetExpressionBug extends GroovyTestCase {
     void testAttributeSetAccess() {
         def a = new HasStaticFieldSomeClass()
diff --git a/src/test/groovy/bugs/AutoboxingOfComparisonsBug.groovy b/src/test/groovy/bugs/AutoboxingOfComparisonsBug.groovy
index 722e43e..edb3000 100644
--- a/src/test/groovy/bugs/AutoboxingOfComparisonsBug.groovy
+++ b/src/test/groovy/bugs/AutoboxingOfComparisonsBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class AutoboxingOfComparisonsBug extends GroovyTestCase {
     void testBug() {
         def y = true
diff --git a/src/test/groovy/bugs/BadLineNumberOnExceptionBugTest.groovy b/src/test/groovy/bugs/BadLineNumberOnExceptionBugTest.groovy
index 667852a..56f0977 100644
--- a/src/test/groovy/bugs/BadLineNumberOnExceptionBugTest.groovy
+++ b/src/test/groovy/bugs/BadLineNumberOnExceptionBugTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Ensure that the correct line information is reported when an exception is thrown.
  * <p>
@@ -45,7 +47,7 @@ class BadLineNumberOnExceptionBugTest extends GroovyTestCase {
 
                 assert false
             } catch (MissingMethodException e) {
-                def scriptTraceElement = e.stackTrace.find { it.className.startsWith(GroovyTestCase.TEST_SCRIPT_NAME_PREFIX) }
+                def scriptTraceElement = e.stackTrace.find { it.className.startsWith(groovy.test.GroovyTestCase.TEST_SCRIPT_NAME_PREFIX) }
                 assert 9 == scriptTraceElement.lineNumber
             }
         """
@@ -65,7 +67,7 @@ class BadLineNumberOnExceptionBugTest extends GroovyTestCase {
 
                 assert false
             } catch (MissingPropertyException e) {
-                def scriptTraceElement = e.stackTrace.find { it.className.startsWith(GroovyTestCase.TEST_SCRIPT_NAME_PREFIX) }
+                def scriptTraceElement = e.stackTrace.find { it.className.startsWith(groovy.test.GroovyTestCase.TEST_SCRIPT_NAME_PREFIX) }
                 assert 3 == scriptTraceElement.lineNumber
             }
         """
diff --git a/src/test/groovy/bugs/BadScriptNameBug.groovy b/src/test/groovy/bugs/BadScriptNameBug.groovy
index 45f071f..a3c92e7 100644
--- a/src/test/groovy/bugs/BadScriptNameBug.groovy
+++ b/src/test/groovy/bugs/BadScriptNameBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class BadScriptNameBug extends GroovyTestCase {
 
     void testBug() {
diff --git a/src/test/groovy/bugs/BenchmarkBug.groovy b/src/test/groovy/bugs/BenchmarkBug.groovy
index fd9cb83..a61efe0 100644
--- a/src/test/groovy/bugs/BenchmarkBug.groovy
+++ b/src/test/groovy/bugs/BenchmarkBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * A little performance test
  */
diff --git a/src/test/groovy/bugs/BlockAsClosureBug.groovy b/src/test/groovy/bugs/BlockAsClosureBug.groovy
index 41da92b..73c815f 100644
--- a/src/test/groovy/bugs/BlockAsClosureBug.groovy
+++ b/src/test/groovy/bugs/BlockAsClosureBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class BlockAsClosureBug extends GroovyTestCase {
 
     void testBug() {
diff --git a/src/test/groovy/bugs/BooleanBug.groovy b/src/test/groovy/bugs/BooleanBug.groovy
index bcb79ef..c4fb33c 100644
--- a/src/test/groovy/bugs/BooleanBug.groovy
+++ b/src/test/groovy/bugs/BooleanBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class BooleanBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/ByteIndexBug.groovy b/src/test/groovy/bugs/ByteIndexBug.groovy
index 906882e..7fa5370 100644
--- a/src/test/groovy/bugs/ByteIndexBug.groovy
+++ b/src/test/groovy/bugs/ByteIndexBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class ByteIndexBug extends GroovyTestCase {
     // TODO: this tests a string with 128 nulls - is that what is intended?
     void testBug() {
diff --git a/src/test/groovy/bugs/Bytecode2Bug.groovy b/src/test/groovy/bugs/Bytecode2Bug.groovy
index b6e27b6..0c9bcca 100644
--- a/src/test/groovy/bugs/Bytecode2Bug.groovy
+++ b/src/test/groovy/bugs/Bytecode2Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class Bytecode2Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Bytecode3Bug.groovy b/src/test/groovy/bugs/Bytecode3Bug.groovy
index fee14a4..d346013 100644
--- a/src/test/groovy/bugs/Bytecode3Bug.groovy
+++ b/src/test/groovy/bugs/Bytecode3Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class Bytecode3Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Bytecode4Bug.groovy b/src/test/groovy/bugs/Bytecode4Bug.groovy
index 142d030..64023d0 100644
--- a/src/test/groovy/bugs/Bytecode4Bug.groovy
+++ b/src/test/groovy/bugs/Bytecode4Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class Bytecode4Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Bytecode5Bug.groovy b/src/test/groovy/bugs/Bytecode5Bug.groovy
index 052b980..e42d30f 100644
--- a/src/test/groovy/bugs/Bytecode5Bug.groovy
+++ b/src/test/groovy/bugs/Bytecode5Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class Bytecode5Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Bytecode6Bug.groovy b/src/test/groovy/bugs/Bytecode6Bug.groovy
index c5dd447..d23405d 100644
--- a/src/test/groovy/bugs/Bytecode6Bug.groovy
+++ b/src/test/groovy/bugs/Bytecode6Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class Bytecode6Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Bytecode7Bug.groovy b/src/test/groovy/bugs/Bytecode7Bug.groovy
index f0ea779..46db6fe 100644
--- a/src/test/groovy/bugs/Bytecode7Bug.groovy
+++ b/src/test/groovy/bugs/Bytecode7Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class Bytecode7Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/BytecodeBug.groovy b/src/test/groovy/bugs/BytecodeBug.groovy
index 90ac10d..38f2976 100644
--- a/src/test/groovy/bugs/BytecodeBug.groovy
+++ b/src/test/groovy/bugs/BytecodeBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class BytecodeBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/CallingClosuresWithClosuresBug.groovy b/src/test/groovy/bugs/CallingClosuresWithClosuresBug.groovy
index 3b0ad10..09bc7c9 100644
--- a/src/test/groovy/bugs/CallingClosuresWithClosuresBug.groovy
+++ b/src/test/groovy/bugs/CallingClosuresWithClosuresBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class CallingClosuresWithClosuresBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/CastWhenUsingClosuresBug.groovy b/src/test/groovy/bugs/CastWhenUsingClosuresBug.groovy
index e8f2115..471bbcb 100644
--- a/src/test/groovy/bugs/CastWhenUsingClosuresBug.groovy
+++ b/src/test/groovy/bugs/CastWhenUsingClosuresBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class CastWhenUsingClosuresBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/ChristofsPropertyBug.groovy b/src/test/groovy/bugs/ChristofsPropertyBug.groovy
index 1fa13ad..d6d5acb 100644
--- a/src/test/groovy/bugs/ChristofsPropertyBug.groovy
+++ b/src/test/groovy/bugs/ChristofsPropertyBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class ChristofsPropertyBug extends GroovyTestCase {
 
     def mixedCaseProperty
diff --git a/src/test/groovy/bugs/ClassGeneratorFixesTest.groovy b/src/test/groovy/bugs/ClassGeneratorFixesTest.groovy
index bc7bac5..878d4b3 100644
--- a/src/test/groovy/bugs/ClassGeneratorFixesTest.groovy
+++ b/src/test/groovy/bugs/ClassGeneratorFixesTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 
 class ClassGeneratorFixesTest extends GroovyTestCase {
     def count = 0;
diff --git a/src/test/groovy/bugs/ClassInNamedParamsBug.groovy b/src/test/groovy/bugs/ClassInNamedParamsBug.groovy
index a36649d..25b0d3e 100644
--- a/src/test/groovy/bugs/ClassInNamedParamsBug.groovy
+++ b/src/test/groovy/bugs/ClassInNamedParamsBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class ClassInNamedParamsBug extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/bugs/ClosureInClosureBug.groovy b/src/test/groovy/bugs/ClosureInClosureBug.groovy
index e3083e5..d65bee1 100644
--- a/src/test/groovy/bugs/ClosureInClosureBug.groovy
+++ b/src/test/groovy/bugs/ClosureInClosureBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Bug illustrating the nested closures variable scope visibility issue.
  * l.each is ClosureInClosureBug$1 and it.each is ClosureInClosureBug$2
diff --git a/src/test/groovy/bugs/ClosureTypedVariableBug.groovy b/src/test/groovy/bugs/ClosureTypedVariableBug.groovy
index 2929097..0579194 100644
--- a/src/test/groovy/bugs/ClosureTypedVariableBug.groovy
+++ b/src/test/groovy/bugs/ClosureTypedVariableBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class ClosureTypedVariableBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/ClosureVariableBug.groovy b/src/test/groovy/bugs/ClosureVariableBug.groovy
index a2f8f82..240d88e 100644
--- a/src/test/groovy/bugs/ClosureVariableBug.groovy
+++ b/src/test/groovy/bugs/ClosureVariableBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class ClosureVariableBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/ClosureWithBitwiseDefaultParamTest.groovy b/src/test/groovy/bugs/ClosureWithBitwiseDefaultParamTest.groovy
index e3b7436..cd461f5 100644
--- a/src/test/groovy/bugs/ClosureWithBitwiseDefaultParamTest.groovy
+++ b/src/test/groovy/bugs/ClosureWithBitwiseDefaultParamTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class ClosureWithBitwiseDefaultParamTest extends GroovyTestCase {
     void testAmbiguousStuff() {
         def c = { x, y = 1 | 2, z = 0->
diff --git a/src/test/groovy/bugs/ConstructorBug.groovy b/src/test/groovy/bugs/ConstructorBug.groovy
index 19cf5e7..6b1d713 100644
--- a/src/test/groovy/bugs/ConstructorBug.groovy
+++ b/src/test/groovy/bugs/ConstructorBug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.InvokerHelper
 
 class ConstructorBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/CustomMetaClassTest.groovy b/src/test/groovy/bugs/CustomMetaClassTest.groovy
index df4d41a..d0eedce 100644
--- a/src/test/groovy/bugs/CustomMetaClassTest.groovy
+++ b/src/test/groovy/bugs/CustomMetaClassTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class CustomMetaClassTest extends GroovyTestCase {
 
     @Override
diff --git a/src/test/groovy/bugs/DefVariableBug.groovy b/src/test/groovy/bugs/DefVariableBug.groovy
index 34ccccb..69c9b72 100644
--- a/src/test/groovy/bugs/DefVariableBug.groovy
+++ b/src/test/groovy/bugs/DefVariableBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class DefVariableBug extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/bugs/DirectMethodCallWithVargsTest.groovy b/src/test/groovy/bugs/DirectMethodCallWithVargsTest.groovy
index 13acb07..f9c463d 100644
--- a/src/test/groovy/bugs/DirectMethodCallWithVargsTest.groovy
+++ b/src/test/groovy/bugs/DirectMethodCallWithVargsTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.ClassCodeVisitorSupport
 import org.codehaus.groovy.control.SourceUnit
 import org.codehaus.groovy.ast.expr.MethodCallExpression
diff --git a/src/test/groovy/bugs/ForLoopBug.groovy b/src/test/groovy/bugs/ForLoopBug.groovy
index a965558..4e1dbb7 100644
--- a/src/test/groovy/bugs/ForLoopBug.groovy
+++ b/src/test/groovy/bugs/ForLoopBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class ForLoopBug extends GroovyTestCase {
 
     void testBug() {
diff --git a/src/test/groovy/bugs/FullyQualifiedClassBug.groovy b/src/test/groovy/bugs/FullyQualifiedClassBug.groovy
index cefa434..db30ffb 100644
--- a/src/test/groovy/bugs/FullyQualifiedClassBug.groovy
+++ b/src/test/groovy/bugs/FullyQualifiedClassBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class FullyQualifiedClassBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/FullyQualifiedMethodReturnTypeBug.groovy b/src/test/groovy/bugs/FullyQualifiedMethodReturnTypeBug.groovy
index 17d62fa..a8e7d83 100644
--- a/src/test/groovy/bugs/FullyQualifiedMethodReturnTypeBug.groovy
+++ b/src/test/groovy/bugs/FullyQualifiedMethodReturnTypeBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class FullyQualifiedMethodReturnTypeBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/FullyQualifiedVariableTypeBug.groovy b/src/test/groovy/bugs/FullyQualifiedVariableTypeBug.groovy
index df169d1..b56e98c 100644
--- a/src/test/groovy/bugs/FullyQualifiedVariableTypeBug.groovy
+++ b/src/test/groovy/bugs/FullyQualifiedVariableTypeBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class FullyQualifiedVariableTypeBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/GetterBug.groovy b/src/test/groovy/bugs/GetterBug.groovy
index 013e516..06aa7dc 100644
--- a/src/test/groovy/bugs/GetterBug.groovy
+++ b/src/test/groovy/bugs/GetterBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class GetterBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy1018_Bug.groovy b/src/test/groovy/bugs/Groovy1018_Bug.groovy
index 54cfa2a..9c02bfe 100644
--- a/src/test/groovy/bugs/Groovy1018_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy1018_Bug.groovy
@@ -18,13 +18,15 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test to fix the Jira issues GROOVY-1018 and GROOVY-732.
  * Access to a static field member by a class name:
  *      ClassName.fieldName or ClassName.@fieldName.
  */
 
-class Groovy1018_Bug extends GroovyTestCase { 
+class Groovy1018_Bug extends GroovyTestCase {
 
     public static Object Class = "bar" 
 
diff --git a/src/test/groovy/bugs/Groovy1059_Bug.groovy b/src/test/groovy/bugs/Groovy1059_Bug.groovy
index 5d77d2d..992bb7c 100644
--- a/src/test/groovy/bugs/Groovy1059_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy1059_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * GROOVY-1059
  *
diff --git a/src/test/groovy/bugs/Groovy1081_Bug.groovy b/src/test/groovy/bugs/Groovy1081_Bug.groovy
index 109bc98..0b10f77 100644
--- a/src/test/groovy/bugs/Groovy1081_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy1081_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  *  Verifies that DefaultGroovyMethods.transformLine(Reader, Writer, Closure)
  *  actually writes its output.
diff --git a/src/test/groovy/bugs/Groovy1407_Bug.groovy b/src/test/groovy/bugs/Groovy1407_Bug.groovy
index ab033be..1807fb4 100644
--- a/src/test/groovy/bugs/Groovy1407_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy1407_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy1407_Bug extends GroovyTestCase {
    void testGPathOnMultiKeyMap(){
       // each key is a two-element String list
diff --git a/src/test/groovy/bugs/Groovy1462_Bug.groovy b/src/test/groovy/bugs/Groovy1462_Bug.groovy
index 61221bf..3b257fc 100644
--- a/src/test/groovy/bugs/Groovy1462_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy1462_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  *  Verifies that the Groovy parser can accept quoted methods.
  */
diff --git a/src/test/groovy/bugs/Groovy1465Bug.groovy b/src/test/groovy/bugs/Groovy1465Bug.groovy
index 7285ef9..bef408a 100644
--- a/src/test/groovy/bugs/Groovy1465Bug.groovy
+++ b/src/test/groovy/bugs/Groovy1465Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy1465Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy1593.groovy b/src/test/groovy/bugs/Groovy1593.groovy
index 3ef5abf..0447ee1 100644
--- a/src/test/groovy/bugs/Groovy1593.groovy
+++ b/src/test/groovy/bugs/Groovy1593.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy1593 extends GroovyTestCase {
    void testPropertyAccessInSubClassOfHashMap() {
       def subclass = new SubClassOfHashMap()
diff --git a/src/test/groovy/bugs/Groovy1617_Bug.groovy b/src/test/groovy/bugs/Groovy1617_Bug.groovy
index 11d7a0b..4973a72 100644
--- a/src/test/groovy/bugs/Groovy1617_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy1617_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy1617_Bug extends GroovyTestCase {
    void testCoerceStringIntoStringArray() {
       def expected = ["G","r","o","o","v","y"] as String[]
diff --git a/src/test/groovy/bugs/Groovy1706_Bug.groovy b/src/test/groovy/bugs/Groovy1706_Bug.groovy
index 07d36cf..2b856eb 100644
--- a/src/test/groovy/bugs/Groovy1706_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy1706_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy1706_Bug extends GroovyTestCase {
    void testStaticMethodIsCalledFromSubclass() {
       // disclaimer: static methods shouldn't be
diff --git a/src/test/groovy/bugs/Groovy2271Bug.groovy b/src/test/groovy/bugs/Groovy2271Bug.groovy
index 0632fe8..aec0d72 100644
--- a/src/test/groovy/bugs/Groovy2271Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2271Bug.groovy
@@ -19,6 +19,7 @@
 package groovy.bugs
 
 import groovy.mock.interceptor.StubFor
+import groovy.test.GroovyTestCase
 
 class Groovy2271Bug extends GroovyTestCase {
     static final String TEST_TEXT = "I'm a mock"
diff --git a/src/test/groovy/bugs/Groovy2339Bug.groovy b/src/test/groovy/bugs/Groovy2339Bug.groovy
index a8d7078..846ed6e 100644
--- a/src/test/groovy/bugs/Groovy2339Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2339Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2339Bug extends GroovyTestCase {
 
     void testBug() {
diff --git a/src/test/groovy/bugs/Groovy2348Bug.groovy b/src/test/groovy/bugs/Groovy2348Bug.groovy
index 3a3be2b..cc7b207 100644
--- a/src/test/groovy/bugs/Groovy2348Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2348Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2348Bug extends GroovyTestCase{
   void test () {
      assertEquals( ['1.0', '2.0'], Foo.test(['1.0-vers', '2.0-subvers']))
diff --git a/src/test/groovy/bugs/Groovy2350Bug.groovy b/src/test/groovy/bugs/Groovy2350Bug.groovy
index 50c466f..941fceb 100644
--- a/src/test/groovy/bugs/Groovy2350Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2350Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2350Bug extends GroovyTestCase{
 
      void testNoArg () {
diff --git a/src/test/groovy/bugs/Groovy2351Bug.groovy b/src/test/groovy/bugs/Groovy2351Bug.groovy
index f164830..37ee6ed 100644
--- a/src/test/groovy/bugs/Groovy2351Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2351Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2351Bug extends GroovyTestCase {
    void testVarArgs () {
 
diff --git a/src/test/groovy/bugs/Groovy2391Bug.groovy b/src/test/groovy/bugs/Groovy2391Bug.groovy
index 85d8390..6cf4d60 100644
--- a/src/test/groovy/bugs/Groovy2391Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2391Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2391Bug extends GroovyTestCase{
     void testBug () {
       ArrayList.metaClass.asType = { Class clazz ->
diff --git a/src/test/groovy/bugs/Groovy239_Bug.groovy b/src/test/groovy/bugs/Groovy239_Bug.groovy
index 38fa6ae..13284f8 100644
--- a/src/test/groovy/bugs/Groovy239_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy239_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy239_Bug extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/bugs/Groovy2432Bug.groovy b/src/test/groovy/bugs/Groovy2432Bug.groovy
index 6935a2b..48fc7c2 100644
--- a/src/test/groovy/bugs/Groovy2432Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2432Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyLogTestCase
+
 import java.util.logging.Level
 
 class Groovy2432Bug extends GroovyLogTestCase {
diff --git a/src/test/groovy/bugs/Groovy2490Bug.groovy b/src/test/groovy/bugs/Groovy2490Bug.groovy
index 58179d3..5b09955 100644
--- a/src/test/groovy/bugs/Groovy2490Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2490Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2490Bug extends GroovyTestCase {
     void test () {
         assertEquals One.foo, "hello"
diff --git a/src/test/groovy/bugs/Groovy252_Bug.groovy b/src/test/groovy/bugs/Groovy252_Bug.groovy
index c99b929..aa97fe6 100644
--- a/src/test/groovy/bugs/Groovy252_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy252_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class Groovy252_Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy2549Bug.groovy b/src/test/groovy/bugs/Groovy2549Bug.groovy
index 8ff5930..d1efff8 100644
--- a/src/test/groovy/bugs/Groovy2549Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2549Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2549Bug extends GroovyTestCase {
     void test2549() {
         def c = 2
diff --git a/src/test/groovy/bugs/Groovy2556Bug.groovy b/src/test/groovy/bugs/Groovy2556Bug.groovy
index d2bd8cd..80a93b3 100644
--- a/src/test/groovy/bugs/Groovy2556Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2556Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2556Bug extends GroovyTestCase {
     final String SOME_METHOD_VALUE = 'someMethodValue'
     final String TEST_NAME = 'someName'
diff --git a/src/test/groovy/bugs/Groovy2557Bug.groovy b/src/test/groovy/bugs/Groovy2557Bug.groovy
index 72031e8..d45967f 100644
--- a/src/test/groovy/bugs/Groovy2557Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2557Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2557Bug extends GroovyTestCase{
     void testArray2ListCoercion() {
         String[] args = ['a', 'b']
diff --git a/src/test/groovy/bugs/Groovy2558Bug.groovy b/src/test/groovy/bugs/Groovy2558Bug.groovy
index a30be58..88abe83 100644
--- a/src/test/groovy/bugs/Groovy2558Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2558Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2558Bug extends GroovyTestCase {
     void testMe () {
         Person person = new Person()
diff --git a/src/test/groovy/bugs/Groovy2666Bug.groovy b/src/test/groovy/bugs/Groovy2666Bug.groovy
index fa4c0da..1b917e3 100644
--- a/src/test/groovy/bugs/Groovy2666Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2666Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.GroovyBugError
 
 class Groovy2666Bug extends GroovyTestCase{
diff --git a/src/test/groovy/bugs/Groovy2773Bug.groovy b/src/test/groovy/bugs/Groovy2773Bug.groovy
index 3120ccf..afdf218 100644
--- a/src/test/groovy/bugs/Groovy2773Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2773Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2773Bug extends GroovyTestCase {
     void test() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy278_Bug.groovy b/src/test/groovy/bugs/Groovy278_Bug.groovy
index 458bb6b..13b4fa3 100644
--- a/src/test/groovy/bugs/Groovy278_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy278_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy278_Bug extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/bugs/Groovy2801Bug.groovy b/src/test/groovy/bugs/Groovy2801Bug.groovy
index ebaa363..9398331 100644
--- a/src/test/groovy/bugs/Groovy2801Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2801Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2801Bug extends GroovyTestCase {
     void testOverrideToStringInMapOfClosures() {
         def proxyImpl = [foo: { "Foo!" }, toString: { "overridden." }] as IGroovy2801Bug
diff --git a/src/test/groovy/bugs/Groovy2816Bug.groovy b/src/test/groovy/bugs/Groovy2816Bug.groovy
index 4ab0286..84bf536 100644
--- a/src/test/groovy/bugs/Groovy2816Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2816Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2816Bug extends GroovyTestCase{
     void testMapWithBigListAsValue () {
          [
diff --git a/src/test/groovy/bugs/Groovy2849Bug.groovy b/src/test/groovy/bugs/Groovy2849Bug.groovy
index 51e0d30..f15002a 100644
--- a/src/test/groovy/bugs/Groovy2849Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2849Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2849Bug extends GroovyTestCase {
     def void testPropertySelectionConflictInANestedClosure(){
         assert c1() == 11
diff --git a/src/test/groovy/bugs/Groovy2949Bug.groovy b/src/test/groovy/bugs/Groovy2949Bug.groovy
index 48d93c3..c7c782c 100644
--- a/src/test/groovy/bugs/Groovy2949Bug.groovy
+++ b/src/test/groovy/bugs/Groovy2949Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy2949Bug extends GroovyTestCase {
     void testBug () {
         new GroovyShell().evaluate """
diff --git a/src/test/groovy/bugs/Groovy3069Bug.groovy b/src/test/groovy/bugs/Groovy3069Bug.groovy
index d005be2..4ebe30d 100644
--- a/src/test/groovy/bugs/Groovy3069Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3069Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3069Bug extends GroovyTestCase {
     final String CLOSURE_STR = '[Closure]'
     final String CLASS_METHOD_STR = '[ClassMethod]'
diff --git a/src/test/groovy/bugs/Groovy308_Bug.groovy b/src/test/groovy/bugs/Groovy308_Bug.groovy
index 84c1122..1a58e9e 100644
--- a/src/test/groovy/bugs/Groovy308_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy308_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 import java.io.*
 
 /**
diff --git a/src/test/groovy/bugs/Groovy3135Bug.groovy b/src/test/groovy/bugs/Groovy3135Bug.groovy
index 2374158..c9af84e 100644
--- a/src/test/groovy/bugs/Groovy3135Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3135Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3135Bug extends GroovyTestCase {
     static Byte b = Byte.parseByte("1")
     static Short s = Short.parseShort("2")
diff --git a/src/test/groovy/bugs/Groovy3139Bug.groovy b/src/test/groovy/bugs/Groovy3139Bug.groovy
index e66c762..23e0873 100644
--- a/src/test/groovy/bugs/Groovy3139Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3139Bug.groovy
@@ -19,6 +19,7 @@
 package groovy.bugs
 
 import groovy.mock.interceptor.StubFor
+import groovy.test.GroovyTestCase
 
 class Groovy3139Bug extends GroovyTestCase {
 
diff --git a/src/test/groovy/bugs/Groovy3156And2621Bug.groovy b/src/test/groovy/bugs/Groovy3156And2621Bug.groovy
index 3000bbf..a6fc742 100644
--- a/src/test/groovy/bugs/Groovy3156And2621Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3156And2621Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3156And2621Bug extends GroovyTestCase {
     void testMethodNameResolutionInANestedClosure() {
         assert m() == 'method'
diff --git a/src/test/groovy/bugs/Groovy3163Bug.groovy b/src/test/groovy/bugs/Groovy3163Bug.groovy
index 3a9d57e..50b6b92 100644
--- a/src/test/groovy/bugs/Groovy3163Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3163Bug.groovy
@@ -18,13 +18,11 @@
  */
 package groovy.bugs
 
-import java.math.BigInteger;
+import groovy.test.GroovyTestCase
 
+class Groovy3163Test extends GroovyTestCase {
 
-public class Groovy3163Test extends GroovyTestCase {
-
-public void testSuperOverStatic()
-{
+void testSuperOverStatic() {
     def siws = new Groovy3163SomeImplementorWithStatic()
 
     assert (1 == siws.build(1)[0])
@@ -42,20 +40,20 @@ public void testSuperOverStatic()
 
 class Groovy3163SomeBaseClass {
 
-    public Object build(Integer i) {
-        return i;
+    Object build(Integer i) {
+        return i
     }
 
-    public Object build(BigInteger i) {
-        return i;
+    Object build(BigInteger i) {
+        return i
     }
 
-    public Object build(Class c) {
-        return c;
+    Object build(Class c) {
+        return c
     }
 
-    public Object build(Script s) {
-        return s;
+    Object build(Script s) {
+        return s
     }
 }
 
@@ -63,20 +61,20 @@ class Groovy3163SomeImplementorWithStatic extends Groovy3163SomeBaseClass {
 
     // Comment this out, otherwise the super.build(x) calls won't match the members in our parent.
 
-    public static Object build(Closure c) {
+    static Object build(Closure c) {
         return [c]
     }
 
     // This one will also block a super.build, but it's the Script one.
-    public static Object build(BigDecimal d) {
+    static Object build(BigDecimal d) {
         return [d]
     }
 
-    public Object build(Integer i) {
+    Object build(Integer i) {
         return [super.build(i)]
     }
 
-    public Object build(Script s) {
+    Object build(Script s) {
         return [super.build(s)]
     }
 
diff --git a/src/test/groovy/bugs/Groovy3175_Bug.groovy b/src/test/groovy/bugs/Groovy3175_Bug.groovy
index 1f1023b..c4b6472 100644
--- a/src/test/groovy/bugs/Groovy3175_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3175_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3175_Bug extends GroovyTestCase {
 
     void testSyntheticModifier() {
diff --git a/src/test/groovy/bugs/Groovy3205Bug.groovy b/src/test/groovy/bugs/Groovy3205Bug.groovy
index b1eeb4a..7929391 100644
--- a/src/test/groovy/bugs/Groovy3205Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3205Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3205Bug extends GroovyTestCase {
     def void testOverrideToStringInMapOfClosures() {
         def proxyImpl = [
diff --git a/src/test/groovy/bugs/Groovy3208Bug.groovy b/src/test/groovy/bugs/Groovy3208Bug.groovy
index 692d7cb..3a37b34 100644
--- a/src/test/groovy/bugs/Groovy3208Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3208Bug.groovy
@@ -18,7 +18,9 @@
  */
 package groovy.bugs
 
-public class Groovy3208Bug extends GroovyTestCase {
+import groovy.test.GroovyTestCase
+
+class Groovy3208Bug extends GroovyTestCase {
 
    void testBug () {
       new Sub().each { assertEquals("ABC", it.doIt()) }
diff --git a/src/test/groovy/bugs/Groovy3235Bug.groovy b/src/test/groovy/bugs/Groovy3235Bug.groovy
index 7aa1a1a..5d250f7 100644
--- a/src/test/groovy/bugs/Groovy3235Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3235Bug.groovy
@@ -18,7 +18,9 @@
  */
 package groovy.bugs
 
-public class Groovy3235Bug extends GroovyTestCase {
+import groovy.test.GroovyTestCase
+
+class Groovy3235Bug extends GroovyTestCase {
 
 void testBug3235 () {
       def d = """This is one line.
diff --git a/src/test/groovy/bugs/Groovy3238Bug.groovy b/src/test/groovy/bugs/Groovy3238Bug.groovy
index 64094f7..770547a 100644
--- a/src/test/groovy/bugs/Groovy3238Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3238Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3238Bug extends GroovyTestCase {
     def void testRelativeExactnessToMatchForBigIntegerParam() {
         def obj = new Groovy3238Bug()
diff --git a/src/test/groovy/bugs/Groovy325_Bug.groovy b/src/test/groovy/bugs/Groovy325_Bug.groovy
index 294f8d0..24a5a92 100644
--- a/src/test/groovy/bugs/Groovy325_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy325_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy325_Bug extends GroovyTestCase {
   static boolean staticMethod() {
     return true
diff --git a/src/test/groovy/bugs/Groovy3304Bug.groovy b/src/test/groovy/bugs/Groovy3304Bug.groovy
index efe538d..0acdbb8 100644
--- a/src/test/groovy/bugs/Groovy3304Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3304Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy3304Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy3305Bug.groovy b/src/test/groovy/bugs/Groovy3305Bug.groovy
index c59d982..9edab20 100644
--- a/src/test/groovy/bugs/Groovy3305Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3305Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3305Bug extends GroovyTestCase {
     def void testSingleListExpandingToMultipleArgs() {
         assert foo1([1, "A"]) == "1,A"
diff --git a/src/test/groovy/bugs/Groovy3335Bug.groovy b/src/test/groovy/bugs/Groovy3335Bug.groovy
index 26e68c8..835de67 100644
--- a/src/test/groovy/bugs/Groovy3335Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3335Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3335Bug extends GroovyTestCase {
     void testClassToString() {
         // the following call was resulting in a MethodSelectionException
diff --git a/src/test/groovy/bugs/Groovy3339Bug.groovy b/src/test/groovy/bugs/Groovy3339Bug.groovy
index 54a3a77..1382989 100644
--- a/src/test/groovy/bugs/Groovy3339Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3339Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3339Bug extends GroovyTestCase {
     void testConstantCachingInClosureClasses() {
         // In all the cases below, the OptimizerVisitor replaces number 10 by
diff --git a/src/test/groovy/bugs/Groovy3383Bug.groovy b/src/test/groovy/bugs/Groovy3383Bug.groovy
index 86ed25e..aaa6899 100644
--- a/src/test/groovy/bugs/Groovy3383Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3383Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3383Bug extends GroovyTestCase {
     void testClassUsageInInterfaceDef() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy3389Bug.groovy b/src/test/groovy/bugs/Groovy3389Bug.groovy
index 42efa56..fff0961 100644
--- a/src/test/groovy/bugs/Groovy3389Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3389Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3389Bug extends GroovyTestCase {
     void testFieldHidingByLocalVariable() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy3403Bug.groovy b/src/test/groovy/bugs/Groovy3403Bug.groovy
index a750123..35fda7d 100644
--- a/src/test/groovy/bugs/Groovy3403Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3403Bug.groovy
@@ -19,6 +19,7 @@
 package groovy.bugs
 
 import groovy.mock.interceptor.StubFor
+import groovy.test.GroovyTestCase
 
 class Groovy3403Bug extends GroovyTestCase {
 
diff --git a/src/test/groovy/bugs/Groovy3405Bug.groovy b/src/test/groovy/bugs/Groovy3405Bug.groovy
index d4488c9..bdde81d 100644
--- a/src/test/groovy/bugs/Groovy3405Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3405Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3405Bug extends GroovyTestCase {
 
     protected void tearDown() {
diff --git a/src/test/groovy/bugs/Groovy3410Bug.groovy b/src/test/groovy/bugs/Groovy3410Bug.groovy
index 7c57e2b..6516782 100644
--- a/src/test/groovy/bugs/Groovy3410Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3410Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3410Bug extends GroovyTestCase {
 
     void testClassVerificationErrorsWithBooleanExpUsingPrimitiveFields() {
diff --git a/src/test/groovy/bugs/Groovy3424Bug.groovy b/src/test/groovy/bugs/Groovy3424Bug.groovy
index bab7429..2cd3067 100644
--- a/src/test/groovy/bugs/Groovy3424Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3424Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3424Bug extends GroovyTestCase {
 
     MetaClassRegistry registry
diff --git a/src/test/groovy/bugs/Groovy3426Bug.groovy b/src/test/groovy/bugs/Groovy3426Bug.groovy
index e15ce21..aec3496 100644
--- a/src/test/groovy/bugs/Groovy3426Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3426Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3426Bug extends GroovyTestCase {
 
     MetaClassRegistry registry
diff --git a/src/test/groovy/bugs/Groovy3446Bug.groovy b/src/test/groovy/bugs/Groovy3446Bug.groovy
index defc73b..fc47a84 100644
--- a/src/test/groovy/bugs/Groovy3446Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3446Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 import static java.lang.System.currentTimeMillis
 
 class Groovy3446Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy3462Bug.groovy b/src/test/groovy/bugs/Groovy3462Bug.groovy
index 18eecbe..7d4b5c5 100644
--- a/src/test/groovy/bugs/Groovy3462Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3462Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3462Bug extends GroovyTestCase {
 
     void testClosureWithParameterHavingDefaultExpression() {
diff --git a/src/test/groovy/bugs/Groovy3464Bug.groovy b/src/test/groovy/bugs/Groovy3464Bug.groovy
index 83ca9bf..4ce583a 100644
--- a/src/test/groovy/bugs/Groovy3464Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3464Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit
 import org.codehaus.groovy.control.CompilerConfiguration
 
diff --git a/src/test/groovy/bugs/Groovy3465Bug.groovy b/src/test/groovy/bugs/Groovy3465Bug.groovy
index d95c6ac..a4010a4 100644
--- a/src/test/groovy/bugs/Groovy3465Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3465Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 import static groovy.bugs.Groovy3465Helper.*
 
 class Groovy3465Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy3498Bug.groovy b/src/test/groovy/bugs/Groovy3498Bug.groovy
index 7d36bfe..c3531ce 100644
--- a/src/test/groovy/bugs/Groovy3498Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3498Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3498Bug extends GroovyTestCase {
     void testClosureExpressionFiltering() {
         new GroovyShell().evaluate """
diff --git a/src/test/groovy/bugs/Groovy3509Bug.groovy b/src/test/groovy/bugs/Groovy3509Bug.groovy
index 15a197e..dcef92b 100644
--- a/src/test/groovy/bugs/Groovy3509Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3509Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3509Bug extends GroovyTestCase {
 
     void testGPathInconcistency() {
diff --git a/src/test/groovy/bugs/Groovy3511Bug.groovy b/src/test/groovy/bugs/Groovy3511Bug.groovy
index 50adc6c..4fb7502 100644
--- a/src/test/groovy/bugs/Groovy3511Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3511Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation
 
 class Groovy3511Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy3519Bug.groovy b/src/test/groovy/bugs/Groovy3519Bug.groovy
index fb78429..953c050 100644
--- a/src/test/groovy/bugs/Groovy3519Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3519Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3519Bug extends GroovyTestCase {
 
     void testShouldSkipPrivateMethodsFromCovariantReturnTypeChecks() {
diff --git a/src/test/groovy/bugs/Groovy3560Bug.groovy b/src/test/groovy/bugs/Groovy3560Bug.groovy
index 353d3a3..80b5c0a 100644
--- a/src/test/groovy/bugs/Groovy3560Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3560Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3560Bug extends GroovyTestCase {
     void testVarArgsWithAnInterfaceAsVarArgArrayType() {
         assert Groovy3560Helper.m1(new Groovy3560A(), new Groovy3560B()) == 2
diff --git a/src/test/groovy/bugs/Groovy3574Bug.groovy b/src/test/groovy/bugs/Groovy3574Bug.groovy
index 186fa56..9d66a65 100644
--- a/src/test/groovy/bugs/Groovy3574Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3574Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3574Bug extends GroovyTestCase {
     void testToStringCallDelegationToConvertedClosureProxy() {
         Closure failing1 = { 
diff --git a/src/test/groovy/bugs/Groovy3590Bug.groovy b/src/test/groovy/bugs/Groovy3590Bug.groovy
index 0801f66..3540c49 100644
--- a/src/test/groovy/bugs/Groovy3590Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3590Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3590Bug extends GroovyTestCase {
     void testMapDefaultValueGetWithPrevKeyHavingNullValue() {
         def map = ['key':null]
diff --git a/src/test/groovy/bugs/Groovy3645Bug.groovy b/src/test/groovy/bugs/Groovy3645Bug.groovy
index 8af5f30..5c5e121 100644
--- a/src/test/groovy/bugs/Groovy3645Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3645Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3645Bug extends GroovyTestCase {
     void testMethodCallOnSuperInAStaticMethod() {
         try{
diff --git a/src/test/groovy/bugs/Groovy3658Bug.groovy b/src/test/groovy/bugs/Groovy3658Bug.groovy
index 281cb89..fa3cb14 100644
--- a/src/test/groovy/bugs/Groovy3658Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3658Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3658Bug extends GroovyTestCase {
     void testConstructorWithParameterWithInitialValueAsStaticMethodCallResult() {
         Groovy3658BugHelper bug2 = new Groovy3658BugHelper('person', 'tag')
diff --git a/src/test/groovy/bugs/Groovy3679Bug.groovy b/src/test/groovy/bugs/Groovy3679Bug.groovy
index 00cce73..f4024d8 100644
--- a/src/test/groovy/bugs/Groovy3679Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3679Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3679Bug extends GroovyTestCase {
     void testMapEntryWinOverPvtAndPkgPrivateClassFields() {
         // map entry should win over a package-private field
diff --git a/src/test/groovy/bugs/Groovy3716Bug.groovy b/src/test/groovy/bugs/Groovy3716Bug.groovy
index 62f4841..defd83e 100644
--- a/src/test/groovy/bugs/Groovy3716Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3716Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.ClassHelper
 
 class Groovy3716Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy3718Bug.groovy b/src/test/groovy/bugs/Groovy3718Bug.groovy
index 9dae911..aefa5a6 100644
--- a/src/test/groovy/bugs/Groovy3718Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3718Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3718Bug extends GroovyTestCase {
     void testPatternMatchOfNull() {
         assertFalse null ==~ /[^0-9]+/
diff --git a/src/test/groovy/bugs/Groovy3720Bug.groovy b/src/test/groovy/bugs/Groovy3720Bug.groovy
index c9b4d7e..23a5741 100644
--- a/src/test/groovy/bugs/Groovy3720Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3720Bug.groovy
@@ -19,6 +19,7 @@
 package groovy.bugs
 
 import groovy.mock.interceptor.*
+import groovy.test.GroovyTestCase
 
 class Groovy3720Bug extends GroovyTestCase {
     void testCreateStubNode() {
diff --git a/src/test/groovy/bugs/Groovy3723Bug.groovy b/src/test/groovy/bugs/Groovy3723Bug.groovy
index 642bcc5..6e41ed6 100644
--- a/src/test/groovy/bugs/Groovy3723Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3723Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3723Bug extends GroovyTestCase {
     void testEMCPropertyAccessWitGetPropertySetProperty() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy3726Bug.groovy b/src/test/groovy/bugs/Groovy3726Bug.groovy
index cdc28d2..79845c0 100644
--- a/src/test/groovy/bugs/Groovy3726Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3726Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 import java.lang.reflect.*
 
 class Groovy3726Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy3749Bug.groovy b/src/test/groovy/bugs/Groovy3749Bug.groovy
index e024a25..cdea5ab 100644
--- a/src/test/groovy/bugs/Groovy3749Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3749Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3749Bug extends GroovyTestCase {
     void testScriptsProvidingStaticMainMethod() {
         def scriptStr
diff --git a/src/test/groovy/bugs/Groovy3770Bug.groovy b/src/test/groovy/bugs/Groovy3770Bug.groovy
index 7c11322..e3dad93 100644
--- a/src/test/groovy/bugs/Groovy3770Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3770Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3770Bug extends GroovyTestCase {
     void testSetDelegateAndResolveStrategyOnACurriedClosure() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy3776Bug.groovy b/src/test/groovy/bugs/Groovy3776Bug.groovy
index f5dd30e..5539f1e 100644
--- a/src/test/groovy/bugs/Groovy3776Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3776Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 import java.lang.reflect.*
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 import org.codehaus.groovy.GroovyBugError
diff --git a/src/test/groovy/bugs/Groovy3784Bug.groovy b/src/test/groovy/bugs/Groovy3784Bug.groovy
index 575198c..4fecc68 100644
--- a/src/test/groovy/bugs/Groovy3784Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3784Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3784Bug extends GroovyTestCase {
     void testUseOfDelegateAndThenGenericsSharingTheSameClassHelper() {
         GroovyClassLoader gcl = new GroovyClassLoader()
diff --git a/src/test/groovy/bugs/Groovy3789Bug.groovy b/src/test/groovy/bugs/Groovy3789Bug.groovy
index 95c1482..405e9de 100644
--- a/src/test/groovy/bugs/Groovy3789Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3789Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3789Bug extends GroovyTestCase {
     void testAddReturnWhenLastStatementIsSwitch() {
         def ifClosure = { ->
diff --git a/src/test/groovy/bugs/Groovy3799Bug.groovy b/src/test/groovy/bugs/Groovy3799Bug.groovy
index b05078d..88e494d 100644
--- a/src/test/groovy/bugs/Groovy3799Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3799Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy37XXBug extends GroovyTestCase {
     void testVarArgsWithAnInterfaceAsVarArgArrayTypeWithInheritenceInArgs() {
         def obj
diff --git a/src/test/groovy/bugs/Groovy3801Bug.groovy b/src/test/groovy/bugs/Groovy3801Bug.groovy
index 8e3c4f7..f372910 100644
--- a/src/test/groovy/bugs/Groovy3801Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3801Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3801Bug extends GroovyTestCase {
     void testMainMethodSignature() {
         def gcl = new GroovyClassLoader()
diff --git a/src/test/groovy/bugs/Groovy3818Bug.groovy b/src/test/groovy/bugs/Groovy3818Bug.groovy
index 3cd4b07..0ebd515 100644
--- a/src/test/groovy/bugs/Groovy3818Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3818Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3818Bug extends GroovyTestCase {
     void testCreatingSimilarSetandMapWithComparator() {
         def scompare = { a, b -> a.id <=> b.id } as Comparator
diff --git a/src/test/groovy/bugs/Groovy3827Bug.groovy b/src/test/groovy/bugs/Groovy3827Bug.groovy
index de25663..83cabcf 100644
--- a/src/test/groovy/bugs/Groovy3827Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3827Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy3827Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy3830Bug.groovy b/src/test/groovy/bugs/Groovy3830Bug.groovy
index 9c54dfc..8e1c96d 100644
--- a/src/test/groovy/bugs/Groovy3830Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3830Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3830Bug extends GroovyTestCase {
     void testCallSitesUsageInAnInterface() {
         assert I3830.i == 2
diff --git a/src/test/groovy/bugs/Groovy3831Bug.groovy b/src/test/groovy/bugs/Groovy3831Bug.groovy
index 33a06ff..e268206 100644
--- a/src/test/groovy/bugs/Groovy3831Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3831Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3831Bug extends GroovyTestCase {
     void testClosureDefinitionInSpecialCallsInConstructorsV1() {
         def test = new Test3831V1('hello', ["world"])
diff --git a/src/test/groovy/bugs/Groovy3834Bug.groovy b/src/test/groovy/bugs/Groovy3834Bug.groovy
index 1626c14..94a572d 100644
--- a/src/test/groovy/bugs/Groovy3834Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3834Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3834Bug extends GroovyTestCase {
     void testDuplicateCallsToMissingMethod() {
         def instance = new AClassWithMethodMissingMethod()
diff --git a/src/test/groovy/bugs/Groovy3839Bug.groovy b/src/test/groovy/bugs/Groovy3839Bug.groovy
index 4266391..1fd10f1 100644
--- a/src/test/groovy/bugs/Groovy3839Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3839Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3839Bug extends GroovyTestCase {
     void testGroovyASTTransformationWithOneClass() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy3863Bug.groovy b/src/test/groovy/bugs/Groovy3863Bug.groovy
index 203b981..c6e5726 100644
--- a/src/test/groovy/bugs/Groovy3863Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3863Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3863Bug extends GroovyTestCase {
     void testClassNameAccessInMainMethod() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy3868Bug.groovy b/src/test/groovy/bugs/Groovy3868Bug.groovy
index 4e0d45d..d1999ec 100644
--- a/src/test/groovy/bugs/Groovy3868Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3868Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3868Bug extends GroovyTestCase {
     void testAsTypeCallWithPrimitiveType() {
         callAndcheckResults(Long)
diff --git a/src/test/groovy/bugs/Groovy3871Bug.groovy b/src/test/groovy/bugs/Groovy3871Bug.groovy
index bdb2a78..2e384e9 100644
--- a/src/test/groovy/bugs/Groovy3871Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3871Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Fix for https://issues.apache.org/jira/browse/GROOVY-3871
  */
diff --git a/src/test/groovy/bugs/Groovy3873Bug.groovy b/src/test/groovy/bugs/Groovy3873Bug.groovy
index 2b291c5..5e3ed63 100644
--- a/src/test/groovy/bugs/Groovy3873Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3873Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3873Bug extends GroovyTestCase {
     void testAddingMethodsToMetaClassOfInterface() {
         try {
diff --git a/src/test/groovy/bugs/Groovy3876Bug.groovy b/src/test/groovy/bugs/Groovy3876Bug.groovy
index c022d37..7c584f0 100644
--- a/src/test/groovy/bugs/Groovy3876Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3876Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.typehandling.GroovyCastException
 
 class Groovy3876Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy3894Bug.groovy b/src/test/groovy/bugs/Groovy3894Bug.groovy
index e9b04b9..c2ec4cf 100644
--- a/src/test/groovy/bugs/Groovy3894Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3894Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3894Bug extends GroovyTestCase {
     void testInfinityToBigDecimalConversion() {
         BigDecimal x = 999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
diff --git a/src/test/groovy/bugs/Groovy389_Bug.groovy b/src/test/groovy/bugs/Groovy389_Bug.groovy
index be42203..54ad428 100644
--- a/src/test/groovy/bugs/Groovy389_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy389_Bug.groovy
@@ -18,11 +18,12 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  *  Verifies that closures work inside case blocks.
  *
  */
-
 class Groovy389_Bug extends GroovyTestCase {
  
     void testBug() {
diff --git a/src/test/groovy/bugs/Groovy3904Bug.groovy b/src/test/groovy/bugs/Groovy3904Bug.groovy
index f3567be..a8b7464 100644
--- a/src/test/groovy/bugs/Groovy3904Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3904Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy3904Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy3948Bug.groovy b/src/test/groovy/bugs/Groovy3948Bug.groovy
index 45de093..68c76a2 100644
--- a/src/test/groovy/bugs/Groovy3948Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3948Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3948Bug extends GroovyTestCase {
 
     void testBug1() {
diff --git a/src/test/groovy/bugs/Groovy3949Bug.groovy b/src/test/groovy/bugs/Groovy3949Bug.groovy
index 5fb07c8..266f51b 100644
--- a/src/test/groovy/bugs/Groovy3949Bug.groovy
+++ b/src/test/groovy/bugs/Groovy3949Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy3949Bug extends GroovyTestCase {
     void testClosureCallInStaticContextForClassWithStaticCallMethod() {
         assert Class3949.m { "$it 123" } == "1234 123"
diff --git a/src/test/groovy/bugs/Groovy4006Bug.groovy b/src/test/groovy/bugs/Groovy4006Bug.groovy
index e12dc02..9a279bd 100644
--- a/src/test/groovy/bugs/Groovy4006Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4006Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4006Bug extends GroovyTestCase {
     void testOuterThisReferenceImplicitPassingToInnerClassConstructorNoArg() {
         try {
diff --git a/src/test/groovy/bugs/Groovy4009Bug.groovy b/src/test/groovy/bugs/Groovy4009Bug.groovy
index af4b448..0cae632 100644
--- a/src/test/groovy/bugs/Groovy4009Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4009Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4009Bug extends GroovyTestCase {
     void testNoOfTimesResolveCallIsMade() {
         try {
diff --git a/src/test/groovy/bugs/Groovy4018Bug.groovy b/src/test/groovy/bugs/Groovy4018Bug.groovy
index 35690ce..4ae0b62 100644
--- a/src/test/groovy/bugs/Groovy4018Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4018Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4018Bug extends GroovyTestCase {
 
     void testFloatAsBoolean() {
diff --git a/src/test/groovy/bugs/Groovy4029Bug.groovy b/src/test/groovy/bugs/Groovy4029Bug.groovy
index 63d4f60..6bd4cdd 100644
--- a/src/test/groovy/bugs/Groovy4029Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4029Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4029Bug extends GroovyTestCase {
     void testAddNullKeyEntryInMapUsingSubscriptNotation() {
         Map m = [:]
diff --git a/src/test/groovy/bugs/Groovy4035Bug.groovy b/src/test/groovy/bugs/Groovy4035Bug.groovy
index 8d104e3..b9aa1ef 100644
--- a/src/test/groovy/bugs/Groovy4035Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4035Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4035Bug extends GroovyTestCase {
     void testSuperCallInsideAnAIC() {
         def aic = new Foo4035() {
diff --git a/src/test/groovy/bugs/Groovy4038Bug.groovy b/src/test/groovy/bugs/Groovy4038Bug.groovy
index 30c0f4f..72f4d0d 100644
--- a/src/test/groovy/bugs/Groovy4038Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4038Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4038Bug extends GroovyTestCase {
     void testResondsToOnClosures() {
         def c = {String x -> }
diff --git a/src/test/groovy/bugs/Groovy4046Bug.groovy b/src/test/groovy/bugs/Groovy4046Bug.groovy
index a7297c8..4595435 100644
--- a/src/test/groovy/bugs/Groovy4046Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4046Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4046Bug extends GroovyTestCase {
     void testComparableOnLeftObjectOnRight() {
         assertFalse MyEnum4046.A == new Object()
diff --git a/src/test/groovy/bugs/Groovy4069Bug.groovy b/src/test/groovy/bugs/Groovy4069Bug.groovy
index 2c81e27..aa4855a 100644
--- a/src/test/groovy/bugs/Groovy4069Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4069Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4069Bug extends GroovyTestCase {
 
     void testEMCConstructorWithSubClassingTest1V1() {
diff --git a/src/test/groovy/bugs/Groovy4075Bug.groovy b/src/test/groovy/bugs/Groovy4075Bug.groovy
index f87c458..f5ec207 100644
--- a/src/test/groovy/bugs/Groovy4075Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4075Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4075Bug extends GroovyTestCase {
     static void failChecked() throws Exception {
         throw new Exception(new IllegalArgumentException(new NullPointerException("NPE in failChecked")))
diff --git a/src/test/groovy/bugs/Groovy4078Bug.groovy b/src/test/groovy/bugs/Groovy4078Bug.groovy
index fc13e28..6e33948 100644
--- a/src/test/groovy/bugs/Groovy4078Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4078Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4078Bug extends GroovyTestCase {
     void testInfiniteLoopDetectionInStepUsage() {
         (2..2).step 0, {assert it != null} //IntRange
diff --git a/src/test/groovy/bugs/Groovy4080Bug.groovy b/src/test/groovy/bugs/Groovy4080Bug.groovy
index 4e44939..1a71b12 100644
--- a/src/test/groovy/bugs/Groovy4080Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4080Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4080Bug extends GroovyTestCase {
     public void testClassGeneratedWithAnnotationHavingGrabOnImport() {
         GroovyShell shell = new GroovyShell(new GroovyClassLoader())
diff --git a/src/test/groovy/bugs/Groovy4098Bug.groovy b/src/test/groovy/bugs/Groovy4098Bug.groovy
index 7b9769c..99bd083 100644
--- a/src/test/groovy/bugs/Groovy4098Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4098Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4098Bug extends GroovyTestCase {
     public String propertyOne
     public String propertyTwo
diff --git a/src/test/groovy/bugs/Groovy4104Bug.groovy b/src/test/groovy/bugs/Groovy4104Bug.groovy
index 31b1960..b30cfcb 100644
--- a/src/test/groovy/bugs/Groovy4104Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4104Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.MethodClosure
 
 class Groovy4104Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4106Bug.groovy b/src/test/groovy/bugs/Groovy4106Bug.groovy
index 659ac18..57dc228 100644
--- a/src/test/groovy/bugs/Groovy4106Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4106Bug.groovy
@@ -19,6 +19,7 @@
 package groovy.bugs
 
 import groovy.lang.MetaClassRegistry.MetaClassCreationHandle
+import groovy.test.GroovyTestCase
 
 class Groovy4106Bug extends GroovyTestCase {
     void testStackOverflowError() {
diff --git a/src/test/groovy/bugs/Groovy4107Bug.groovy b/src/test/groovy/bugs/Groovy4107Bug.groovy
index fe45ecb..3b6a9ef 100644
--- a/src/test/groovy/bugs/Groovy4107Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4107Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy4107Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4111Bug.groovy b/src/test/groovy/bugs/Groovy4111Bug.groovy
index 0f01090..01f2cef 100644
--- a/src/test/groovy/bugs/Groovy4111Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4111Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy4111Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4116Bug.groovy b/src/test/groovy/bugs/Groovy4116Bug.groovy
index db75413..73a09dc 100644
--- a/src/test/groovy/bugs/Groovy4116Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4116Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy4116Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4119Bug.groovy b/src/test/groovy/bugs/Groovy4119Bug.groovy
index 95895ff..d01c820 100644
--- a/src/test/groovy/bugs/Groovy4119Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4119Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4119Bug extends GroovyTestCase {
     void testThis$0PassingInSuperCallWithinInnerClasses() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy4120Bug.groovy b/src/test/groovy/bugs/Groovy4120Bug.groovy
index c2ec392..486d548 100644
--- a/src/test/groovy/bugs/Groovy4120Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4120Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy4120Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4121Bug.groovy b/src/test/groovy/bugs/Groovy4121Bug.groovy
index 50cf160..3c26e6d 100644
--- a/src/test/groovy/bugs/Groovy4121Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4121Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy4121Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4129Bug.groovy b/src/test/groovy/bugs/Groovy4129Bug.groovy
index 0fb521a..a861663 100644
--- a/src/test/groovy/bugs/Groovy4129Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4129Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4129Bug extends GroovyTestCase {
     void testImplicitThisPassingInObjInitBlock() {
         new GroovyShell().parse """
diff --git a/src/test/groovy/bugs/Groovy4131Bug.groovy b/src/test/groovy/bugs/Groovy4131Bug.groovy
index e7e6da3..4b648dc 100644
--- a/src/test/groovy/bugs/Groovy4131Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4131Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4131Bug extends GroovyTestCase {
     void testTwoMainMethodsInAScript() {
         try {
diff --git a/src/test/groovy/bugs/Groovy4133Bug.groovy b/src/test/groovy/bugs/Groovy4133Bug.groovy
index 06f4444..2854f99 100644
--- a/src/test/groovy/bugs/Groovy4133Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4133Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4133Bug extends GroovyTestCase {
     void testDelegateAnnotationWithNativeMethods() {
         new GroovyShell().evaluate """
diff --git a/src/test/groovy/bugs/Groovy4134Bug.groovy b/src/test/groovy/bugs/Groovy4134Bug.groovy
index f80eea5..b949232 100644
--- a/src/test/groovy/bugs/Groovy4134Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4134Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4134Bug extends GroovyTestCase {
     void testClosureParamsWithDefaultValues() {
         def c = {Integer maxRows = Integer.MAX_VALUE -> maxRows}
diff --git a/src/test/groovy/bugs/Groovy4139Bug.groovy b/src/test/groovy/bugs/Groovy4139Bug.groovy
index 960cfdc..c47cdd4 100644
--- a/src/test/groovy/bugs/Groovy4139Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4139Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4139Bug extends GroovyTestCase {
     void testEmptyStringAsMapEntryKey() {
         use (groovy.time.TimeCategory) {
diff --git a/src/test/groovy/bugs/Groovy4170Bug.groovy b/src/test/groovy/bugs/Groovy4170Bug.groovy
index 38e9281..33a7e13 100644
--- a/src/test/groovy/bugs/Groovy4170Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4170Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4170Bug extends GroovyTestCase {
     void testClosureCurrying() {
         new CurryFoo4170().bar()
diff --git a/src/test/groovy/bugs/Groovy4188Bug.groovy b/src/test/groovy/bugs/Groovy4188Bug.groovy
index b666979..e10670f 100644
--- a/src/test/groovy/bugs/Groovy4188Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4188Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy4188Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4191Bug.groovy b/src/test/groovy/bugs/Groovy4191Bug.groovy
index 4b28da6..f847fe4 100644
--- a/src/test/groovy/bugs/Groovy4191Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4191Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4191Bug extends GroovyTestCase {
     void testPutIntoArray() {
         recreateProblem()    
diff --git a/src/test/groovy/bugs/Groovy4193Bug.groovy b/src/test/groovy/bugs/Groovy4193Bug.groovy
index efc11a5..6db3096 100644
--- a/src/test/groovy/bugs/Groovy4193Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4193Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.ImportNode
 
 class Groovy4193Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4202Bug.groovy b/src/test/groovy/bugs/Groovy4202Bug.groovy
index 0132c94..f611b49 100644
--- a/src/test/groovy/bugs/Groovy4202Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4202Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4202Bug extends GroovyTestCase {
     void testSuccessiveMCModificationFirstClassThenInstance() {
         def inst0 = new Foo4202()
diff --git a/src/test/groovy/bugs/Groovy4206Bug.groovy b/src/test/groovy/bugs/Groovy4206Bug.groovy
index 68ae8f2..011c118 100644
--- a/src/test/groovy/bugs/Groovy4206Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4206Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4206Bug extends GroovyTestCase {
     void testIsNamesForBooleanProps() {
         assert Bar4206.isValid()
diff --git a/src/test/groovy/bugs/Groovy4235Bug.groovy b/src/test/groovy/bugs/Groovy4235Bug.groovy
index dd19b52..f38224d 100644
--- a/src/test/groovy/bugs/Groovy4235Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4235Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4235Bug extends GroovyTestCase {
     void testAccessStaticPropInsideClosure() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy4241Bug.groovy b/src/test/groovy/bugs/Groovy4241Bug.groovy
index 70ea488..244e2c4 100644
--- a/src/test/groovy/bugs/Groovy4241Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4241Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4241Bug extends GroovyTestCase {
     void testAsTypeWithinvokeMethodOverridden() {
         Foo4241.metaClass.invokeMethod = { String name, args ->
diff --git a/src/test/groovy/bugs/Groovy4243Bug.groovy b/src/test/groovy/bugs/Groovy4243Bug.groovy
index bd40a8f..2714763 100644
--- a/src/test/groovy/bugs/Groovy4243Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4243Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.*
 
 class Groovy4243Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4246Bug.groovy b/src/test/groovy/bugs/Groovy4246Bug.groovy
index 1803329..edf71f0 100644
--- a/src/test/groovy/bugs/Groovy4246Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4246Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4246Bug extends GroovyTestCase {
     void testPostFixExpEvaluations() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy4247Bug.groovy b/src/test/groovy/bugs/Groovy4247Bug.groovy
index e1fb616..5cd2529 100644
--- a/src/test/groovy/bugs/Groovy4247Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4247Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4247Bug extends GroovyTestCase {
     void testNewFileRenameToMethod() {
         def file = new File('blah_blah')
diff --git a/src/test/groovy/bugs/Groovy4252Bug.groovy b/src/test/groovy/bugs/Groovy4252Bug.groovy
index bc5e78b..10830bd 100644
--- a/src/test/groovy/bugs/Groovy4252Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4252Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyShellTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy4252Bug extends GroovyShellTestCase {
diff --git a/src/test/groovy/bugs/Groovy4257Bug.groovy b/src/test/groovy/bugs/Groovy4257Bug.groovy
index 5e31b67..45cb7a9 100644
--- a/src/test/groovy/bugs/Groovy4257Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4257Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4257Bug extends GroovyTestCase {
     void testSetUnique() {
         Set orig = [[3035, 26972], [2795, 34412]]
diff --git a/src/test/groovy/bugs/Groovy4264Bug.groovy b/src/test/groovy/bugs/Groovy4264Bug.groovy
index 5be9e54..ae5d955 100644
--- a/src/test/groovy/bugs/Groovy4264Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4264Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4264Bug extends GroovyTestCase {
     void testSubClassHavingMainEntryPoint() {
         try {
diff --git a/src/test/groovy/bugs/Groovy4272Bug.groovy b/src/test/groovy/bugs/Groovy4272Bug.groovy
index 7973f16..03d4605 100644
--- a/src/test/groovy/bugs/Groovy4272Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4272Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyShellTestCase
+
 class Groovy4272Bug extends GroovyShellTestCase {
     void testAstBuilderOptimizerVisitorConflictInCompilation() {
         evaluate """
diff --git a/src/test/groovy/bugs/Groovy4273Bug.groovy b/src/test/groovy/bugs/Groovy4273Bug.groovy
index 823c742..af35171 100644
--- a/src/test/groovy/bugs/Groovy4273Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4273Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyShellTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy4273Bug extends GroovyShellTestCase {
diff --git a/src/test/groovy/bugs/Groovy4287Bug.groovy b/src/test/groovy/bugs/Groovy4287Bug.groovy
index 9f3e79c..662350d 100644
--- a/src/test/groovy/bugs/Groovy4287Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4287Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.tools.GroovyStarter
 
 class Groovy4287Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4293Bug.groovy b/src/test/groovy/bugs/Groovy4293Bug.groovy
index 401d5da..dfd5dfb 100644
--- a/src/test/groovy/bugs/Groovy4293Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4293Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4293Bug extends GroovyTestCase {
     void testNoBUGMessageForNullScriptPassedToCompiler() {
         try {
diff --git a/src/test/groovy/bugs/Groovy4386_Bug.groovy b/src/test/groovy/bugs/Groovy4386_Bug.groovy
index 999e361..ffe084d 100644
--- a/src/test/groovy/bugs/Groovy4386_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4386_Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.runtime.ResourceGroovyMethods
 
diff --git a/src/test/groovy/bugs/Groovy4393Bug.groovy b/src/test/groovy/bugs/Groovy4393Bug.groovy
index c080790..e9a1051 100644
--- a/src/test/groovy/bugs/Groovy4393Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4393Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.junit.Ignore
 
 @Ignore('requires a specific configuration, see: https://issues.apache.org/jira/browse/GROOVY-4393 for details')
diff --git a/src/test/groovy/bugs/Groovy4410Bug.groovy b/src/test/groovy/bugs/Groovy4410Bug.groovy
index 8acc8c5..f7cf82b 100644
--- a/src/test/groovy/bugs/Groovy4410Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4410Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4410Bug extends GroovyTestCase {
     void testBridgeMethodWithArrayTypeParameterV1() {
         StringProducer1 sp = new StringProducer1()
diff --git a/src/test/groovy/bugs/Groovy4414Bug.groovy b/src/test/groovy/bugs/Groovy4414Bug.groovy
index 6de72d4..dfa9148 100644
--- a/src/test/groovy/bugs/Groovy4414Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4414Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.InvokerHelper
 
 class Groovy4414Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4415Bug.groovy b/src/test/groovy/bugs/Groovy4415Bug.groovy
index 6b9a440..59a6f00 100644
--- a/src/test/groovy/bugs/Groovy4415Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4415Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4415Bug extends GroovyTestCase {
     void testCompilerShouldFindMethod() {
         // interface defined in Groovy
diff --git a/src/test/groovy/bugs/Groovy4416Bug.groovy b/src/test/groovy/bugs/Groovy4416Bug.groovy
index 37de17e..af4e5f6 100644
--- a/src/test/groovy/bugs/Groovy4416Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4416Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4416Bug extends GroovyTestCase {
     void testImplicitThisPassingInNonStaticInnerClassesBug() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy4435Bug.groovy b/src/test/groovy/bugs/Groovy4435Bug.groovy
index 2b47990..ee85921 100644
--- a/src/test/groovy/bugs/Groovy4435Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4435Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy4435Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4449Bug.groovy b/src/test/groovy/bugs/Groovy4449Bug.groovy
index 66e03f2..6efa4c3 100644
--- a/src/test/groovy/bugs/Groovy4449Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4449Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy4449Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4457GenericTypeDeclarationLeakTest.groovy b/src/test/groovy/bugs/Groovy4457GenericTypeDeclarationLeakTest.groovy
index d684408..35ebf73 100644
--- a/src/test/groovy/bugs/Groovy4457GenericTypeDeclarationLeakTest.groovy
+++ b/src/test/groovy/bugs/Groovy4457GenericTypeDeclarationLeakTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4457GenericTypeDeclarationLeakTest extends GroovyTestCase {
 
     void testLeak() {
diff --git a/src/test/groovy/bugs/Groovy4471Bug.groovy b/src/test/groovy/bugs/Groovy4471Bug.groovy
index a3a8fba..3efdb28 100644
--- a/src/test/groovy/bugs/Groovy4471Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4471Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 
 class Groovy4471Bug extends GroovyTestCase {
     void testShouldNotThrowNPE() {
diff --git a/src/test/groovy/bugs/Groovy4480Bug.groovy b/src/test/groovy/bugs/Groovy4480Bug.groovy
index 1461f75..33270dc 100644
--- a/src/test/groovy/bugs/Groovy4480Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4480Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Checks that if else can be used on a single line.
  * A regression got introduced wiht extended command expression that dissallowed if else on the same line
diff --git a/src/test/groovy/bugs/Groovy4497Bug.groovy b/src/test/groovy/bugs/Groovy4497Bug.groovy
index 7db697d..e729fc5 100644
--- a/src/test/groovy/bugs/Groovy4497Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4497Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4497Bug extends GroovyTestCase {
     void testAccessSuperPrivateField() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy4516Bug.groovy b/src/test/groovy/bugs/Groovy4516Bug.groovy
index 482dbb3..498526b 100644
--- a/src/test/groovy/bugs/Groovy4516Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4516Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4516Bug extends GroovyTestCase {
     void testDelegateMethodsWithDefaultValues() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy4584Bug.groovy b/src/test/groovy/bugs/Groovy4584Bug.groovy
index b384aa2..1868f5e 100644
--- a/src/test/groovy/bugs/Groovy4584Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4584Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4584Bug extends GroovyTestCase {
     void testInnerClass() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy4720Bug.groovy b/src/test/groovy/bugs/Groovy4720Bug.groovy
index cb89523..07d99e2 100644
--- a/src/test/groovy/bugs/Groovy4720Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4720Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Groovy-4720: Method overriding with ExpandoMetaClass is partially broken
  */
diff --git a/src/test/groovy/bugs/Groovy4857Bug.groovy b/src/test/groovy/bugs/Groovy4857Bug.groovy
index 090cdcb..f6d6755 100644
--- a/src/test/groovy/bugs/Groovy4857Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4857Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4857Bug extends GroovyTestCase {
     void testMissingMethodNotUnsupportedOperation() {
         try {
diff --git a/src/test/groovy/bugs/Groovy4861Bug.groovy b/src/test/groovy/bugs/Groovy4861Bug.groovy
index 0d76b44..2aa33a7 100644
--- a/src/test/groovy/bugs/Groovy4861Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4861Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4861Bug extends GroovyTestCase {
     void testCallSitesUsageInNestedInterface() {
         assert Foo4861.A.j == 3
diff --git a/src/test/groovy/bugs/Groovy4922Bug.groovy b/src/test/groovy/bugs/Groovy4922Bug.groovy
index 1767f33..3452a3c 100644
--- a/src/test/groovy/bugs/Groovy4922Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4922Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4922Bug extends GroovyTestCase {
     void testShouldNotThrowStackOverflow() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy4958Bug.groovy b/src/test/groovy/bugs/Groovy4958Bug.groovy
index 0b781d9..cea1807 100644
--- a/src/test/groovy/bugs/Groovy4958Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4958Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 
 class Groovy4958Bug extends GroovyTestCase {
     void testConfigSlurperParsingConfigFilesWithDollarSymbolInPropValues() {
diff --git a/src/test/groovy/bugs/Groovy4966Bug.groovy b/src/test/groovy/bugs/Groovy4966Bug.groovy
index d098708..ca1e26f 100644
--- a/src/test/groovy/bugs/Groovy4966Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4966Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 
 class Groovy4966Bug extends GroovyTestCase {
     void testMethodsThatUseMultiDimensionalArrays() {
diff --git a/src/test/groovy/bugs/Groovy4967Bug.groovy b/src/test/groovy/bugs/Groovy4967Bug.groovy
index 418d52f..8644dc9 100644
--- a/src/test/groovy/bugs/Groovy4967Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4967Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 
 class Groovy4967Bug extends GroovyTestCase {
     void testListToLinkedHashSetConversion() {
diff --git a/src/test/groovy/bugs/Groovy4973Bug.groovy b/src/test/groovy/bugs/Groovy4973Bug.groovy
index 2a37356..31a9add 100644
--- a/src/test/groovy/bugs/Groovy4973Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4973Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4973Bug extends GroovyTestCase {
     void testRangeWithDifferentFromToNumericTypes() {
         assert (1L..10).every { it.class == Long }
diff --git a/src/test/groovy/bugs/Groovy4980Bug.groovy b/src/test/groovy/bugs/Groovy4980Bug.groovy
index 0c622a3..c6de3f2 100644
--- a/src/test/groovy/bugs/Groovy4980Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4980Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4980Bug extends GroovyTestCase {
     void testNamedArgumentWithInnerClassConstructor() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy4986Bug.groovy b/src/test/groovy/bugs/Groovy4986Bug.groovy
index 3462769..c19d162 100644
--- a/src/test/groovy/bugs/Groovy4986Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4986Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 import java.sql.Timestamp
 
 class Groovy4986Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy4989Bug.groovy b/src/test/groovy/bugs/Groovy4989Bug.groovy
index 11b2a7a..9043001 100644
--- a/src/test/groovy/bugs/Groovy4989Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4989Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy4989Bug extends GroovyTestCase {
     void testCovariantReturnForGetterImplmentedAsProperty() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy4999Bug.groovy b/src/test/groovy/bugs/Groovy4999Bug.groovy
index a23d40f..36c4cdc 100644
--- a/src/test/groovy/bugs/Groovy4999Bug.groovy
+++ b/src/test/groovy/bugs/Groovy4999Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 
 class Groovy4999Bug extends GroovyTestCase {
     void testStaticOverloadedMixinMethods() {
diff --git a/src/test/groovy/bugs/Groovy5025Bug.groovy b/src/test/groovy/bugs/Groovy5025Bug.groovy
index 923a1eb..5cc6cd3 100644
--- a/src/test/groovy/bugs/Groovy5025Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5025Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5025Bug extends GroovyTestCase {
     void testDisableAstBuilder() {
         def config = new org.codehaus.groovy.control.CompilerConfiguration()
diff --git a/src/test/groovy/bugs/Groovy5030Bug.groovy b/src/test/groovy/bugs/Groovy5030Bug.groovy
index 8c8c058..8860db1 100644
--- a/src/test/groovy/bugs/Groovy5030Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5030Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5030Bug extends GroovyTestCase {
     void testPrimitiveOptimizationGuardsMixupInInheritanceCase() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy5033Bug.groovy b/src/test/groovy/bugs/Groovy5033Bug.groovy
index ca82c66..916ee08 100644
--- a/src/test/groovy/bugs/Groovy5033Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5033Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5033Bug extends GroovyTestCase {
     void testAnnotationsOnAdditionalMethodsCreatedForOptionalParams() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy5056Bug.groovy b/src/test/groovy/bugs/Groovy5056Bug.groovy
index f30649a..74ced7e 100644
--- a/src/test/groovy/bugs/Groovy5056Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5056Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5056Bug extends GroovyTestCase {
     void testASortedSetMinusACollection() {
         def comparator = [compare: {a,b->
diff --git a/src/test/groovy/bugs/Groovy5061.groovy b/src/test/groovy/bugs/Groovy5061.groovy
index dfca210..0bc9a0b 100644
--- a/src/test/groovy/bugs/Groovy5061.groovy
+++ b/src/test/groovy/bugs/Groovy5061.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit
 
diff --git a/src/test/groovy/bugs/Groovy5101Test.groovy b/src/test/groovy/bugs/Groovy5101Test.groovy
index 80ebb19..fb0c051 100644
--- a/src/test/groovy/bugs/Groovy5101Test.groovy
+++ b/src/test/groovy/bugs/Groovy5101Test.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5101Test extends GroovyTestCase {
 
     static class ClassA {
diff --git a/src/test/groovy/bugs/Groovy5109Bug.groovy b/src/test/groovy/bugs/Groovy5109Bug.groovy
index 72a133f..b3ef843 100644
--- a/src/test/groovy/bugs/Groovy5109Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5109Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5109Bug extends GroovyTestCase {
     void testShouldNotThrowArrayOutOfBounds() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy5122Bug.groovy b/src/test/groovy/bugs/Groovy5122Bug.groovy
index 0b09240..e987e64 100644
--- a/src/test/groovy/bugs/Groovy5122Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5122Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5122Bug extends GroovyTestCase {
     void testInterfaceFieldShouldBeInitialized() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy5137Bug.groovy b/src/test/groovy/bugs/Groovy5137Bug.groovy
index 4d28eca..465745a 100644
--- a/src/test/groovy/bugs/Groovy5137Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5137Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5137Bug extends GroovyTestCase {
     void testShouldNotThrowGroovyBugError() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy513_Bug.groovy b/src/test/groovy/bugs/Groovy513_Bug.groovy
index 9d91be2..c73613e 100644
--- a/src/test/groovy/bugs/Groovy513_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy513_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  *  Verifies that comparisons to Integer.MIN_VALUE work
  */
diff --git a/src/test/groovy/bugs/Groovy5150Bug.groovy b/src/test/groovy/bugs/Groovy5150Bug.groovy
index a0cc8e5..5b1d33a 100644
--- a/src/test/groovy/bugs/Groovy5150Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5150Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import junit.framework.TestCase
 import org.codehaus.groovy.control.CompilationFailedException
 import org.codehaus.groovy.control.CompilerConfiguration
diff --git a/src/test/groovy/bugs/Groovy5152Bug.groovy b/src/test/groovy/bugs/Groovy5152Bug.groovy
index 0961e5e..cfa5163 100644
--- a/src/test/groovy/bugs/Groovy5152Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5152Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5152Bug extends GroovyTestCase {
     void testShouldNotThrowClassFormatError() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy5185Bug.groovy b/src/test/groovy/bugs/Groovy5185Bug.groovy
index 4fc1b80..d2f28fe 100644
--- a/src/test/groovy/bugs/Groovy5185Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5185Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5185Bug extends GroovyTestCase {
     void testShouldNotThrowMethodMissingException() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy5193Bug.groovy b/src/test/groovy/bugs/Groovy5193Bug.groovy
index f83643c..be76f0c 100644
--- a/src/test/groovy/bugs/Groovy5193Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5193Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class Groovy5193Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy5210Bug.groovy b/src/test/groovy/bugs/Groovy5210Bug.groovy
index e2e1769..63ac690 100644
--- a/src/test/groovy/bugs/Groovy5210Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5210Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5210Bug extends GroovyTestCase {
     void testAssignPrimitiveArrayToSet() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy5212Bug.groovy b/src/test/groovy/bugs/Groovy5212Bug.groovy
index 3bdaf92..0b75332 100644
--- a/src/test/groovy/bugs/Groovy5212Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5212Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.ClassNode
 import org.objectweb.asm.Opcodes
 import org.codehaus.groovy.tools.javac.JavaStubGenerator
diff --git a/src/test/groovy/bugs/Groovy5260Bug.groovy b/src/test/groovy/bugs/Groovy5260Bug.groovy
index 367111d..6c95ebc 100644
--- a/src/test/groovy/bugs/Groovy5260Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5260Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.ClassNode
 import org.codehaus.groovy.ast.CompileUnit
 import org.codehaus.groovy.ast.ModuleNode
diff --git a/src/test/groovy/bugs/Groovy5272Bug.groovy b/src/test/groovy/bugs/Groovy5272Bug.groovy
index 3044d1e..c953a23 100644
--- a/src/test/groovy/bugs/Groovy5272Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5272Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5272Bug extends GroovyTestCase {
     /**
      * In Groovy-5272, there are chances that the following test fails.
diff --git a/src/test/groovy/bugs/Groovy5285Bug.groovy b/src/test/groovy/bugs/Groovy5285Bug.groovy
index 96e01c2..a704627 100644
--- a/src/test/groovy/bugs/Groovy5285Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5285Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5285Bug extends GroovyTestCase {
     void testShouldNotThrowStackOverflow() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy5396Bug.groovy b/src/test/groovy/bugs/Groovy5396Bug.groovy
index 8157ad4..a147c18 100644
--- a/src/test/groovy/bugs/Groovy5396Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5396Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5396Bug extends GroovyTestCase {
     void testClassAccessToPackageLocalPropertyInSuper() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy5418Bug.groovy b/src/test/groovy/bugs/Groovy5418Bug.groovy
index 2238019..8a5502e 100644
--- a/src/test/groovy/bugs/Groovy5418Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5418Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5418Bug extends GroovyTestCase {
     void testShouldRecognizeCovariantReturnType() {
         assertScript '''interface Base {
diff --git a/src/test/groovy/bugs/Groovy5425_Bug.groovy b/src/test/groovy/bugs/Groovy5425_Bug.groovy
index 1b7d500..155f62a 100644
--- a/src/test/groovy/bugs/Groovy5425_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5425_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Check Range.size finishes in a timely fashion. If we get a regression on this bug,
  * the build will take 10 - 20 minutes longer than normal
diff --git a/src/test/groovy/bugs/Groovy5572Bug.groovy b/src/test/groovy/bugs/Groovy5572Bug.groovy
index 2fab37c..eebf5f8 100644
--- a/src/test/groovy/bugs/Groovy5572Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5572Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5572Bug extends GroovyTestCase {
     void testTernaryOperator() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy558_616_Bug.groovy b/src/test/groovy/bugs/Groovy558_616_Bug.groovy
index 7b3ac27..841c2a0 100644
--- a/src/test/groovy/bugs/Groovy558_616_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy558_616_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
   * Fixes GROOVY-558 and GROOVY-616.
   * A fully qualified class name ending with .class or not were not recognized properly.
diff --git a/src/test/groovy/bugs/Groovy5687Bug.groovy b/src/test/groovy/bugs/Groovy5687Bug.groovy
index 0a052ef..fb8b94b 100644
--- a/src/test/groovy/bugs/Groovy5687Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5687Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 import java.text.SimpleDateFormat
 
 class Groovy5687Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy5783Bug.groovy b/src/test/groovy/bugs/Groovy5783Bug.groovy
index 89a626e..8f75e35 100644
--- a/src/test/groovy/bugs/Groovy5783Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5783Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5783Bug extends GroovyTestCase {
 
     void testDefaultTypeTransformationCreatesLinkedHashSet() {
diff --git a/src/test/groovy/bugs/Groovy5802Bug.groovy b/src/test/groovy/bugs/Groovy5802Bug.groovy
index 86c5ae4..4f33888 100644
--- a/src/test/groovy/bugs/Groovy5802Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5802Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.InvokerHelper
 
 class Groovy5802Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy5806Bug.groovy b/src/test/groovy/bugs/Groovy5806Bug.groovy
index f7ef71e..bdfe8bd 100644
--- a/src/test/groovy/bugs/Groovy5806Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5806Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 import java.util.concurrent.Callable
 
 class Groovy5806Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy5852Bug.groovy b/src/test/groovy/bugs/Groovy5852Bug.groovy
index 5b9b83f..1264880 100644
--- a/src/test/groovy/bugs/Groovy5852Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5852Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy5852Bug extends GroovyTestCase {
     void testMissingProperty() {
         def errMsg = shouldFail '''
diff --git a/src/test/groovy/bugs/Groovy5915Bug.groovy b/src/test/groovy/bugs/Groovy5915Bug.groovy
index 7a36b18..2d4268a 100644
--- a/src/test/groovy/bugs/Groovy5915Bug.groovy
+++ b/src/test/groovy/bugs/Groovy5915Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.*
 import org.codehaus.groovy.control.messages.*
 
diff --git a/src/test/groovy/bugs/Groovy6042Bug.groovy b/src/test/groovy/bugs/Groovy6042Bug.groovy
index cad24b6..459b4f8 100644
--- a/src/test/groovy/bugs/Groovy6042Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6042Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6042Bug extends GroovyTestCase {
     void testShouldAllowObjectAsConfigKey() {
         Map result = new ConfigSlurper().parse('''
diff --git a/src/test/groovy/bugs/Groovy6045Bug.groovy b/src/test/groovy/bugs/Groovy6045Bug.groovy
index bdf811b..381ed88 100644
--- a/src/test/groovy/bugs/Groovy6045Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6045Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6045Bug extends GroovyTestCase {
     void testCallingSafeSuperShouldNotThrowVerifyError() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy6072Bug.groovy b/src/test/groovy/bugs/Groovy6072Bug.groovy
index c31c067..c238797 100644
--- a/src/test/groovy/bugs/Groovy6072Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6072Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6072Bug extends GroovyTestCase {
     void testShouldNotChangeBinExpToClassExp() {
         assertScript '''import groovy.transform.ASTTest
diff --git a/src/test/groovy/bugs/Groovy6086Bug.groovy b/src/test/groovy/bugs/Groovy6086Bug.groovy
index a547f04..49eb6f4 100644
--- a/src/test/groovy/bugs/Groovy6086Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6086Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.CompilePhase
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit
diff --git a/src/test/groovy/bugs/Groovy6271Bug.groovy b/src/test/groovy/bugs/Groovy6271Bug.groovy
index 8d6131d..f9c3b37 100644
--- a/src/test/groovy/bugs/Groovy6271Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6271Bug.groovy
@@ -19,7 +19,7 @@
 package groovy.bugs
 
 import gls.CompilableTestSupport
-import groovy.transform.NotYetImplemented
+import groovy.test.NotYetImplemented
 
 class Groovy6271Bug extends CompilableTestSupport {
 
diff --git a/src/test/groovy/bugs/Groovy6374Bug.groovy b/src/test/groovy/bugs/Groovy6374Bug.groovy
index 89ba1f7..1eb3cb1 100644
--- a/src/test/groovy/bugs/Groovy6374Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6374Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6374Bug extends GroovyTestCase {
     void testShouldNotAllowCoercionOfFinalClass() {
         assertScript '''import org.codehaus.groovy.runtime.typehandling.GroovyCastException
diff --git a/src/test/groovy/bugs/Groovy6396Bug.groovy b/src/test/groovy/bugs/Groovy6396Bug.groovy
index dbf944b..de6bd71 100644
--- a/src/test/groovy/bugs/Groovy6396Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6396Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6396Bug extends GroovyTestCase {
     void testClassUsageInInterfaceDef() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy6508Bug.groovy b/src/test/groovy/bugs/Groovy6508Bug.groovy
index 970cad6..1ffab00 100644
--- a/src/test/groovy/bugs/Groovy6508Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6508Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 import java.util.concurrent.Callable
 
 /**
diff --git a/src/test/groovy/bugs/Groovy6522Bug.groovy b/src/test/groovy/bugs/Groovy6522Bug.groovy
index 45cf98e..6570d18 100644
--- a/src/test/groovy/bugs/Groovy6522Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6522Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6522Bug extends GroovyTestCase {
     // this is a non-regression test that makes sure
     // that the fix for 6522 doesn't introduce breaking changes
diff --git a/src/test/groovy/bugs/Groovy662Bug.groovy b/src/test/groovy/bugs/Groovy662Bug.groovy
index 99b871a..ccf47cb 100644
--- a/src/test/groovy/bugs/Groovy662Bug.groovy
+++ b/src/test/groovy/bugs/Groovy662Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 //  The order of the classes is crucial, the first must be the GroovyTestCase.  Its name doesn't
 //  matter it just has to be first.
 
diff --git a/src/test/groovy/bugs/Groovy666_Bug.groovy b/src/test/groovy/bugs/Groovy666_Bug.groovy
index 6c4c5c6..33c0857 100644
--- a/src/test/groovy/bugs/Groovy666_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy666_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyShellTestCase
+
 class Groovy666_Bug extends GroovyShellTestCase {
   void testRunScript() {
     evaluate("x = 1")
diff --git a/src/test/groovy/bugs/Groovy6722Bug.groovy b/src/test/groovy/bugs/Groovy6722Bug.groovy
index 5fff2ca..73b171f 100644
--- a/src/test/groovy/bugs/Groovy6722Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6722Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6722Bug extends GroovyTestCase {
     void testThatCompilerRecognizesCovariantArray() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy674_Bug.groovy b/src/test/groovy/bugs/Groovy674_Bug.groovy
index bd3a043..d7b481b 100644
--- a/src/test/groovy/bugs/Groovy674_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy674_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  *  Test to ensure all the right exceptions are thrown for all the right/wrong combinations of
  *  parentheses and no parameters for print and println.
diff --git a/src/test/groovy/bugs/Groovy6755Bug.groovy b/src/test/groovy/bugs/Groovy6755Bug.groovy
index c27ad2c..99c1a07 100644
--- a/src/test/groovy/bugs/Groovy6755Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6755Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.tools.FileSystemCompiler
 
diff --git a/src/test/groovy/bugs/Groovy675_Bug.groovy b/src/test/groovy/bugs/Groovy675_Bug.groovy
index 9f72f85..ace0329 100644
--- a/src/test/groovy/bugs/Groovy675_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy675_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy675_Bug extends GroovyTestCase {
     void testStringAndGString() {
     assert "\\"!="\\\\" 
diff --git a/src/test/groovy/bugs/Groovy6764Bug.groovy b/src/test/groovy/bugs/Groovy6764Bug.groovy
index c33c791..e4f9a42 100644
--- a/src/test/groovy/bugs/Groovy6764Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6764Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6764Bug extends GroovyTestCase {
     void testStaticImportViaInheritedInterface() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy6786Bug.groovy b/src/test/groovy/bugs/Groovy6786Bug.groovy
index d8611e8..44aeaa4 100644
--- a/src/test/groovy/bugs/Groovy6786Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6786Bug.groovy
@@ -18,7 +18,7 @@
  */
 package groovy.bugs
 
-import groovy.transform.NotYetImplemented
+import groovy.test.NotYetImplemented
 import groovy.transform.stc.StaticTypeCheckingTestCase
 
 class Groovy6786Bug extends StaticTypeCheckingTestCase {
diff --git a/src/test/groovy/bugs/Groovy6804Bug.groovy b/src/test/groovy/bugs/Groovy6804Bug.groovy
index 18243c4..b9cb04a 100644
--- a/src/test/groovy/bugs/Groovy6804Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6804Bug.groovy
@@ -18,7 +18,7 @@
  */
 package groovy.bugs
 
-import groovy.transform.NotYetImplemented
+import groovy.test.NotYetImplemented
 import groovy.transform.stc.StaticTypeCheckingTestCase
 
 class Groovy6804Bug extends StaticTypeCheckingTestCase {
diff --git a/src/test/groovy/bugs/Groovy6808Bug.groovy b/src/test/groovy/bugs/Groovy6808Bug.groovy
index 0d87cca..15efcc7 100644
--- a/src/test/groovy/bugs/Groovy6808Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6808Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6808Bug extends GroovyTestCase {
     void testThatInnerClassTableIsNotCorrupt() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy6811Bug.groovy b/src/test/groovy/bugs/Groovy6811Bug.groovy
index 1cfbc78..b474c52 100644
--- a/src/test/groovy/bugs/Groovy6811Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6811Bug.groovy
@@ -20,6 +20,8 @@
 
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6811Bug extends GroovyTestCase {
     void testShouldAllowAnonymousInnerClassFromNonStaticInnerClass() {
         assertScript '''class CreatePaymentPanel {
diff --git a/src/test/groovy/bugs/Groovy6821Bug.groovy b/src/test/groovy/bugs/Groovy6821Bug.groovy
index 459fa2f..926c6d6 100644
--- a/src/test/groovy/bugs/Groovy6821Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6821Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests that 6821 is fixed using an explicit Outer.this notation if not using @CompileStatic
  */
diff --git a/src/test/groovy/bugs/Groovy6830Bug.groovy b/src/test/groovy/bugs/Groovy6830Bug.groovy
index 6978cae..4aad2f5 100644
--- a/src/test/groovy/bugs/Groovy6830Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6830Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6830Bug extends GroovyTestCase {
     void testShouldAccessOuterClassMethodFromInnerClassClosure() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy6841Bug.groovy b/src/test/groovy/bugs/Groovy6841Bug.groovy
index 1ed2199..d969ec5 100644
--- a/src/test/groovy/bugs/Groovy6841Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6841Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6841Bug extends GroovyTestCase {
     void testShouldNotThrowNPEduringCompilation() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy6862Bug.groovy b/src/test/groovy/bugs/Groovy6862Bug.groovy
index cc5c98e..64af86f 100644
--- a/src/test/groovy/bugs/Groovy6862Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6862Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6862Bug extends GroovyTestCase {
     void testDollarAllowedInTraitMethodNames() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy6932Bug.groovy b/src/test/groovy/bugs/Groovy6932Bug.groovy
index 706c17b..671a0f5 100644
--- a/src/test/groovy/bugs/Groovy6932Bug.groovy
+++ b/src/test/groovy/bugs/Groovy6932Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy6932Bug extends GroovyTestCase {
     void testLoggingWithinClosuresShouldHaveGuards() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy7031Bug.groovy b/src/test/groovy/bugs/Groovy7031Bug.groovy
index 3bb4750..e94f472 100644
--- a/src/test/groovy/bugs/Groovy7031Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7031Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7031Bug extends GroovyTestCase {
 
     void test() {
diff --git a/src/test/groovy/bugs/Groovy7081Bug.groovy b/src/test/groovy/bugs/Groovy7081Bug.groovy
index 1415318..240620d 100644
--- a/src/test/groovy/bugs/Groovy7081Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7081Bug.groovy
@@ -19,6 +19,8 @@
 
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7081Bug extends GroovyTestCase {
     void testShouldSeeThatMethodIsNotImplemented() {
         def msg = shouldFail '''
diff --git a/src/test/groovy/bugs/Groovy7204Bug.groovy b/src/test/groovy/bugs/Groovy7204Bug.groovy
index b297112..5c5f20e 100644
--- a/src/test/groovy/bugs/Groovy7204Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7204Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7204Bug extends GroovyTestCase {
     void testTypeChecked1() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy7248Bug.groovy b/src/test/groovy/bugs/Groovy7248Bug.groovy
index b8057fb..7e44d64 100644
--- a/src/test/groovy/bugs/Groovy7248Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7248Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * StatementWriter.writeTryCatchFinally visits the finally block
  * twice, once for the normal path and once again for the "catch all"
diff --git a/src/test/groovy/bugs/Groovy7291Bug.groovy b/src/test/groovy/bugs/Groovy7291Bug.groovy
index f82925c..8f7a5a9 100644
--- a/src/test/groovy/bugs/Groovy7291Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7291Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7291Bug extends GroovyTestCase {
 
     void testPrimitiveDouble() {
diff --git a/src/test/groovy/bugs/Groovy7520Bug.groovy b/src/test/groovy/bugs/Groovy7520Bug.groovy
index bbfb452..0160fa1 100644
--- a/src/test/groovy/bugs/Groovy7520Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7520Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7520Bug extends GroovyTestCase {
     void testShouldSeeConflictUsingAbstractMethod() {
         def msg = shouldFail '''
diff --git a/src/test/groovy/bugs/Groovy7584Bug.groovy b/src/test/groovy/bugs/Groovy7584Bug.groovy
index 6f4772f..42b65e2 100644
--- a/src/test/groovy/bugs/Groovy7584Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7584Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7584Bug extends GroovyTestCase {
     void testTraitFieldModifiersAreRetained() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy7691Bug.groovy b/src/test/groovy/bugs/Groovy7691Bug.groovy
index 58588b0..5ffe0ee 100644
--- a/src/test/groovy/bugs/Groovy7691Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7691Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7691Bug extends GroovyTestCase {
 //    @NotYetImplemented
     void testCovariantGenericField() {
diff --git a/src/test/groovy/bugs/Groovy7709Bug.groovy b/src/test/groovy/bugs/Groovy7709Bug.groovy
index be5e789..d363274 100644
--- a/src/test/groovy/bugs/Groovy7709Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7709Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7709Bug extends GroovyTestCase {
 
     void testConvertedClosureAsGroovyObject() {
diff --git a/src/test/groovy/bugs/Groovy770_Bug.groovy b/src/test/groovy/bugs/Groovy770_Bug.groovy
index 5995150..f0e25a1 100644
--- a/src/test/groovy/bugs/Groovy770_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy770_Bug.groovy
@@ -21,6 +21,8 @@
 
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy770_Bug extends GroovyTestCase {
      
     void testBug() {
diff --git a/src/test/groovy/bugs/Groovy7721Bug.groovy b/src/test/groovy/bugs/Groovy7721Bug.groovy
index 4e41958..f116d6b 100644
--- a/src/test/groovy/bugs/Groovy7721Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7721Bug.groovy
@@ -20,6 +20,7 @@
 
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit
 
diff --git a/src/test/groovy/bugs/Groovy7753Bug.groovy b/src/test/groovy/bugs/Groovy7753Bug.groovy
index 8134eee..b11dcc2 100644
--- a/src/test/groovy/bugs/Groovy7753Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7753Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7753Bug extends GroovyTestCase {
 
     void testGroovy7753() {
diff --git a/src/test/groovy/bugs/Groovy7797Bug.groovy b/src/test/groovy/bugs/Groovy7797Bug.groovy
index 892b6eb..afdef3a 100644
--- a/src/test/groovy/bugs/Groovy7797Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7797Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7797Bug extends GroovyTestCase {
     void test() {
         new GroovyShell().evaluate('''
diff --git a/src/test/groovy/bugs/Groovy779_Bug.groovy b/src/test/groovy/bugs/Groovy779_Bug.groovy
index 8ec2adb..0cc8ca0 100644
--- a/src/test/groovy/bugs/Groovy779_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy779_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy779_Bug extends GroovyTestCase {
 
     def boolean exceptionCalled = false
diff --git a/src/test/groovy/bugs/Groovy7812Bug.groovy b/src/test/groovy/bugs/Groovy7812Bug.groovy
index ac94ee6..fab71db 100644
--- a/src/test/groovy/bugs/Groovy7812Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7812Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.tools.GroovyStarter
 
 class Groovy7812Bug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/Groovy7876Bug.groovy b/src/test/groovy/bugs/Groovy7876Bug.groovy
index 051e56e..71ae904 100644
--- a/src/test/groovy/bugs/Groovy7876Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7876Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7876Bug extends GroovyTestCase {
     void testClassCastExceptionsFromCompareToShouldNotLeakOutOfEqualityCheck() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy7912Bug.groovy b/src/test/groovy/bugs/Groovy7912Bug.groovy
index 005974c..e7801b1 100644
--- a/src/test/groovy/bugs/Groovy7912Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7912Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 import static java.util.Collections.EMPTY_LIST
 import static java.util.Collections.emptyList
 
diff --git a/src/test/groovy/bugs/Groovy7916Bug.groovy b/src/test/groovy/bugs/Groovy7916Bug.groovy
index 4a7ebcf..b705ec1 100644
--- a/src/test/groovy/bugs/Groovy7916Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7916Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7916Bug extends GroovyTestCase {
     void testShouldBeAbleToOverrideStaticConstantProperties() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy7917Bug.groovy b/src/test/groovy/bugs/Groovy7917Bug.groovy
index 7016cd3..89616a9 100644
--- a/src/test/groovy/bugs/Groovy7917Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7917Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7917Bug extends GroovyTestCase {
     void testShouldBeAbleToOverrideStaticConstantProperties() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy7920Bug.groovy b/src/test/groovy/bugs/Groovy7920Bug.groovy
index f59a63f..78acc29 100644
--- a/src/test/groovy/bugs/Groovy7920Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7920Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7920Bug extends GroovyTestCase {
     void testGetAtViaInterface() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy7921Bug.groovy b/src/test/groovy/bugs/Groovy7921Bug.groovy
index 5f68ba7..d302b6e 100644
--- a/src/test/groovy/bugs/Groovy7921Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7921Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7921Bug extends GroovyTestCase {
     void testShouldBeAbleToAssignThisInsideCategoryAnnotatedClass() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy7924Bug.groovy b/src/test/groovy/bugs/Groovy7924Bug.groovy
index 4c33c22..44b6fa3 100644
--- a/src/test/groovy/bugs/Groovy7924Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7924Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7924Bug extends GroovyTestCase {
     void testShouldBeAbleToAssignThisInsideCategoryAnnotatedClass() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy7933Bug.groovy b/src/test/groovy/bugs/Groovy7933Bug.groovy
index bf31c60..765c409 100644
--- a/src/test/groovy/bugs/Groovy7933Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7933Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7933Bug extends GroovyTestCase {
 
     void testPrimitiveMethodArgsSelection() {
diff --git a/src/test/groovy/bugs/Groovy7937Bug.groovy b/src/test/groovy/bugs/Groovy7937Bug.groovy
index 9b2f2f4..9a8c8d5 100644
--- a/src/test/groovy/bugs/Groovy7937Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7937Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7937Bug extends GroovyTestCase {
     void testMethodsWithinAnInstanceShouldBeChosenAheadOfDGMMethodsOnAnInterface() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy7938Bug.groovy b/src/test/groovy/bugs/Groovy7938Bug.groovy
index be7000a..a068be4 100644
--- a/src/test/groovy/bugs/Groovy7938Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7938Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7938Bug extends GroovyTestCase {
     void testClassUsageInInterfaceDef() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy7951Bug.groovy b/src/test/groovy/bugs/Groovy7951Bug.groovy
index ec523c8..812740d 100644
--- a/src/test/groovy/bugs/Groovy7951Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7951Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.ClassCodeExpressionTransformer
 import org.codehaus.groovy.ast.ClassCodeVisitorSupport
 import org.codehaus.groovy.ast.ClassNode
diff --git a/src/test/groovy/bugs/Groovy7958Bug.groovy b/src/test/groovy/bugs/Groovy7958Bug.groovy
index 1198c39..541f4c7 100644
--- a/src/test/groovy/bugs/Groovy7958Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7958Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7958Bug extends GroovyTestCase {
     void testCommaSepVariableDeclarationAfterIf() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy7969Bug.groovy b/src/test/groovy/bugs/Groovy7969Bug.groovy
index edcaed4..fcecfdc 100644
--- a/src/test/groovy/bugs/Groovy7969Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7969Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7969Bug extends GroovyTestCase {
     void testBindablePropertySettersHaveValidModifiersForMethod() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy7970Bug.groovy b/src/test/groovy/bugs/Groovy7970Bug.groovy
index 9bda2a3..5d5395a 100644
--- a/src/test/groovy/bugs/Groovy7970Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7970Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7970Bug extends GroovyTestCase {
 
     private static final String getScriptAIC(String visibility, boolean cs) {
diff --git a/src/test/groovy/bugs/Groovy7985Bug.groovy b/src/test/groovy/bugs/Groovy7985Bug.groovy
index e0b45b5..c2b781a 100644
--- a/src/test/groovy/bugs/Groovy7985Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7985Bug.groovy
@@ -22,6 +22,8 @@
 
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7985Bug extends GroovyTestCase {
     void test1() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy7994Bug.groovy b/src/test/groovy/bugs/Groovy7994Bug.groovy
index 4f4c84a..ba6b881 100644
--- a/src/test/groovy/bugs/Groovy7994Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7994Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7994Bug extends GroovyTestCase {
     void testJavaBeanPropertiesAvailableInInnerClasses() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy7995Bug.groovy b/src/test/groovy/bugs/Groovy7995Bug.groovy
index d3856fb..b1d142a 100644
--- a/src/test/groovy/bugs/Groovy7995Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7995Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7995Bug extends GroovyTestCase{
 
     void testClosureShortSyntaxCallFromOtherClosure(){
diff --git a/src/test/groovy/bugs/Groovy7996Bug.groovy b/src/test/groovy/bugs/Groovy7996Bug.groovy
index cc6a3d0..12452e3 100644
--- a/src/test/groovy/bugs/Groovy7996Bug.groovy
+++ b/src/test/groovy/bugs/Groovy7996Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy7996Bug extends GroovyTestCase {
     void testPropertyAccessFromInnerClass() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8026Bug.groovy b/src/test/groovy/bugs/Groovy8026Bug.groovy
index 8483ee0..ef0ec4c 100644
--- a/src/test/groovy/bugs/Groovy8026Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8026Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8026Bug extends GroovyTestCase {
     void testJavaBeanPropertiesAvailableInInnerClasses() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8030Bug.groovy b/src/test/groovy/bugs/Groovy8030Bug.groovy
index 5438989..f3d89e6 100644
--- a/src/test/groovy/bugs/Groovy8030Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8030Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8030Bug extends GroovyTestCase {
     void testCompileStaticWithBinaryExpressionAndFlowTyping() {
         assertScript """
diff --git a/src/test/groovy/bugs/Groovy8048Bug.groovy b/src/test/groovy/bugs/Groovy8048Bug.groovy
index e541f2f..23b4cf4 100644
--- a/src/test/groovy/bugs/Groovy8048Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8048Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8048Bug extends GroovyTestCase {
     void testFinalFieldInPreCompiledTrait() {
         def shell = new GroovyShell(getClass().classLoader)
diff --git a/src/test/groovy/bugs/Groovy8055Bug.groovy b/src/test/groovy/bugs/Groovy8055Bug.groovy
index ca15c7e..968403e 100644
--- a/src/test/groovy/bugs/Groovy8055Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8055Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8055Bug extends GroovyTestCase {
     void test1() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8059Bug.groovy b/src/test/groovy/bugs/Groovy8059Bug.groovy
index a86cdb2..85d77fd 100644
--- a/src/test/groovy/bugs/Groovy8059Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8059Bug.groovy
@@ -22,6 +22,8 @@
 
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8059Bug extends GroovyTestCase {
     void test1() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8060Bug.groovy b/src/test/groovy/bugs/Groovy8060Bug.groovy
index a4b1af1..9c8ba01 100644
--- a/src/test/groovy/bugs/Groovy8060Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8060Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8060Bug extends GroovyTestCase {
     void testLoggingWithinClosuresThatAreMethodArgsShouldHaveGuards() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8065Bug.groovy b/src/test/groovy/bugs/Groovy8065Bug.groovy
index 5c3f018..be18ca3 100644
--- a/src/test/groovy/bugs/Groovy8065Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8065Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8065Bug extends GroovyTestCase {
     void testMapWithCustomSetDuringAsTypeCast() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8084Bug.groovy b/src/test/groovy/bugs/Groovy8084Bug.groovy
index db92df8..ef2de01 100644
--- a/src/test/groovy/bugs/Groovy8084Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8084Bug.groovy
@@ -19,7 +19,7 @@
 package groovy.bugs
 
 import gls.CompilableTestSupport
-import groovy.transform.NotYetImplemented
+import groovy.test.NotYetImplemented
 
 class Groovy8084Bug extends CompilableTestSupport {
     // TODO REFINE ME
diff --git a/src/test/groovy/bugs/Groovy8085Bug.groovy b/src/test/groovy/bugs/Groovy8085Bug.groovy
index f1a9310..7bf3a17 100644
--- a/src/test/groovy/bugs/Groovy8085Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8085Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8085Bug extends GroovyTestCase {
     void testTryCatchFinally() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8110Bug.groovy b/src/test/groovy/bugs/Groovy8110Bug.groovy
index 355d462..0cd8afa 100644
--- a/src/test/groovy/bugs/Groovy8110Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8110Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8110Bug extends GroovyTestCase {
     void testListenerListWithArrayParam() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8138Bug.groovy b/src/test/groovy/bugs/Groovy8138Bug.groovy
index e89ac25..a014dcc 100644
--- a/src/test/groovy/bugs/Groovy8138Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8138Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8138Bug extends GroovyTestCase {
     void test() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8140Bug.groovy b/src/test/groovy/bugs/Groovy8140Bug.groovy
index 4de5c88..abb83e0 100644
--- a/src/test/groovy/bugs/Groovy8140Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8140Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 
 class Groovy8140Bug extends GroovyTestCase {
 
diff --git a/src/test/groovy/bugs/Groovy8176Bug.groovy b/src/test/groovy/bugs/Groovy8176Bug.groovy
index 5c52122..5f0c5cb 100644
--- a/src/test/groovy/bugs/Groovy8176Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8176Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8176Bug extends GroovyTestCase {
     void testTernaryWithTap() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8212Bug.groovy b/src/test/groovy/bugs/Groovy8212Bug.groovy
index e4bc5b6..3145aa7 100644
--- a/src/test/groovy/bugs/Groovy8212Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8212Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8212Bug extends GroovyTestCase {
     void test() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8229Bug.groovy b/src/test/groovy/bugs/Groovy8229Bug.groovy
index eac96a2..1dd225b 100644
--- a/src/test/groovy/bugs/Groovy8229Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8229Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8229Bug extends GroovyTestCase {
     void testFinallyBlockInClosureCalledOnce() {
         assert shouldFail(
diff --git a/src/test/groovy/bugs/Groovy8260Bug.groovy b/src/test/groovy/bugs/Groovy8260Bug.groovy
index e69d68b..5c79158 100644
--- a/src/test/groovy/bugs/Groovy8260Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8260Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8260Bug extends GroovyTestCase {
 
     void testNoCastForInstanceofInsideLoop() {
diff --git a/src/test/groovy/bugs/Groovy8313Bug.groovy b/src/test/groovy/bugs/Groovy8313Bug.groovy
index aa3b43f..dc1fda5 100644
--- a/src/test/groovy/bugs/Groovy8313Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8313Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8313Bug extends GroovyTestCase {
     void testCorrectBridgeMethodForGenericArrayReturnType() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy831_Bug.groovy b/src/test/groovy/bugs/Groovy831_Bug.groovy
index f79b646..bed9aed 100644
--- a/src/test/groovy/bugs/Groovy831_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy831_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test for fixing the Jira issue GROOVY-831
  */
diff --git a/src/test/groovy/bugs/Groovy8327Bug.groovy b/src/test/groovy/bugs/Groovy8327Bug.groovy
index a70cb81..8a5ad26 100644
--- a/src/test/groovy/bugs/Groovy8327Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8327Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8327Bug extends GroovyTestCase {
     void testCallStaticMethodInClosureParamOfThisConstructor() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8337Bug.groovy b/src/test/groovy/bugs/Groovy8337Bug.groovy
index 87c166e..d47d34d 100644
--- a/src/test/groovy/bugs/Groovy8337Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8337Bug.groovy
@@ -19,7 +19,7 @@
 package groovy.bugs
 
 import gls.CompilableTestSupport
-import groovy.transform.NotYetImplemented
+import groovy.test.NotYetImplemented
 
 class Groovy8337Bug extends CompilableTestSupport {
     void testGroovy8337() {
diff --git a/src/test/groovy/bugs/Groovy8339Bug.groovy b/src/test/groovy/bugs/Groovy8339Bug.groovy
index 5fa94f5..c9e2393 100644
--- a/src/test/groovy/bugs/Groovy8339Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8339Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 // TODO add JVM option `--illegal-access=deny` when all warnings fixed
 class Groovy8339Bug extends GroovyTestCase {
     void testCase2() {
diff --git a/src/test/groovy/bugs/Groovy8383Bug.groovy b/src/test/groovy/bugs/Groovy8383Bug.groovy
index 1091260..45793f5 100644
--- a/src/test/groovy/bugs/Groovy8383Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8383Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8383Bug extends GroovyTestCase {
     void testCompileStaticWithOptimizedConstants() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8389Bug.groovy b/src/test/groovy/bugs/Groovy8389Bug.groovy
index bf56fbd..5443b27 100644
--- a/src/test/groovy/bugs/Groovy8389Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8389Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8389Bug extends GroovyTestCase {
     void testLocalMethodInvoked() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8409Bug.groovy b/src/test/groovy/bugs/Groovy8409Bug.groovy
index c4de8b7..d122ae5 100644
--- a/src/test/groovy/bugs/Groovy8409Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8409Bug.groovy
@@ -19,7 +19,7 @@
 package groovy.bugs
 
 import gls.CompilableTestSupport
-import groovy.transform.NotYetImplemented
+import groovy.test.NotYetImplemented
 
 class Groovy8409Bug extends CompilableTestSupport {
     @NotYetImplemented
diff --git a/src/test/groovy/bugs/Groovy8439Bug.groovy b/src/test/groovy/bugs/Groovy8439Bug.groovy
index ccca137..e01c78e 100644
--- a/src/test/groovy/bugs/Groovy8439Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8439Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8439Bug extends GroovyTestCase {
     void testSTCGenerics() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8474Bug.groovy b/src/test/groovy/bugs/Groovy8474Bug.groovy
index ab64c75..b235f0f 100644
--- a/src/test/groovy/bugs/Groovy8474Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8474Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8474Bug extends GroovyTestCase {
     void testSettingSuperProperty() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8523Bug.groovy b/src/test/groovy/bugs/Groovy8523Bug.groovy
index d3c3165..a0450e4 100755
--- a/src/test/groovy/bugs/Groovy8523Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8523Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8523Bug extends GroovyTestCase {
     void testInstanceofNot1() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8600Bug.groovy b/src/test/groovy/bugs/Groovy8600Bug.groovy
index 43d4093..17fccfc 100644
--- a/src/test/groovy/bugs/Groovy8600Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8600Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8600Bug extends GroovyTestCase {
     void testClosureFieldUseWithinMethod() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8609Bug.groovy b/src/test/groovy/bugs/Groovy8609Bug.groovy
index 2ada73c..a6ed105 100644
--- a/src/test/groovy/bugs/Groovy8609Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8609Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 
 @CompileStatic
diff --git a/src/test/groovy/bugs/Groovy8629Bug.groovy b/src/test/groovy/bugs/Groovy8629Bug.groovy
index f4c949d..e96da8f 100644
--- a/src/test/groovy/bugs/Groovy8629Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8629Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 public class Groovy8629Bug extends GroovyTestCase {
     void testNestedMethodCallInConstructor() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy872Bug.groovy b/src/test/groovy/bugs/Groovy872Bug.groovy
index b4f3c17..a912354 100644
--- a/src/test/groovy/bugs/Groovy872Bug.groovy
+++ b/src/test/groovy/bugs/Groovy872Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy872 extends GroovyTestCase {
   void testScript ( ) {
     assertScript ( """
diff --git a/src/test/groovy/bugs/Groovy8764Bug.groovy b/src/test/groovy/bugs/Groovy8764Bug.groovy
index 9102f04..1150db1 100644
--- a/src/test/groovy/bugs/Groovy8764Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8764Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8764Bug extends GroovyTestCase {
     void testDgmMethodInClosureInAnonymousInnerClass() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8816Bug.groovy b/src/test/groovy/bugs/Groovy8816Bug.groovy
index 880a02e..2d6854d 100644
--- a/src/test/groovy/bugs/Groovy8816Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8816Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8816Bug extends GroovyTestCase {
     void testCallNoArgClosureWithArg() {
         def msg = shouldFail MissingMethodException, '''
diff --git a/src/test/groovy/bugs/Groovy8819Bug.groovy b/src/test/groovy/bugs/Groovy8819Bug.groovy
index 1203eb7..7e0cf39 100644
--- a/src/test/groovy/bugs/Groovy8819Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8819Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8819Bug extends GroovyTestCase {
     void testAccessStaticFieldInThisConstructor() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8833Bug.groovy b/src/test/groovy/bugs/Groovy8833Bug.groovy
index 8fe4b28..6ed3bdb 100644
--- a/src/test/groovy/bugs/Groovy8833Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8833Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8833Bug extends GroovyTestCase {
     void testEqualsAndHashCodeAndToStringWithCompileStatic() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8864Bug.groovy b/src/test/groovy/bugs/Groovy8864Bug.groovy
index 2c84055..27d804f 100644
--- a/src/test/groovy/bugs/Groovy8864Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8864Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8864Bug extends GroovyTestCase {
     void testGenericsAppliedToStaticMethodsForTraits() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8868Bug.groovy b/src/test/groovy/bugs/Groovy8868Bug.groovy
index d30d8a2..02d8c54 100644
--- a/src/test/groovy/bugs/Groovy8868Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8868Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8868Bug extends GroovyTestCase {
     void testNoargConstructorIncludedForImmutableWithNoProperties() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8881Bug.groovy b/src/test/groovy/bugs/Groovy8881Bug.groovy
index 0e1d2e2..967f5f5 100644
--- a/src/test/groovy/bugs/Groovy8881Bug.groovy
+++ b/src/test/groovy/bugs/Groovy8881Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8881Bug extends GroovyTestCase {
     void testClosureWithinClosureInInnerClassReferencesThisCorrectly() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8887.groovy b/src/test/groovy/bugs/Groovy8887.groovy
index e6cdd09..b56ff9d 100644
--- a/src/test/groovy/bugs/Groovy8887.groovy
+++ b/src/test/groovy/bugs/Groovy8887.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy8887 extends GroovyTestCase {
     void testMultiAssignment() {
         assertScript '''
diff --git a/src/test/groovy/bugs/Groovy8962.groovy b/src/test/groovy/bugs/Groovy8962.groovy
index 69a6e62..ce192d4 100644
--- a/src/test/groovy/bugs/Groovy8962.groovy
+++ b/src/test/groovy/bugs/Groovy8962.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import junit.framework.TestCase
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit
diff --git a/src/test/groovy/bugs/Groovy9074.groovy b/src/test/groovy/bugs/Groovy9074.groovy
index b3ebf16..aac3c9c 100644
--- a/src/test/groovy/bugs/Groovy9074.groovy
+++ b/src/test/groovy/bugs/Groovy9074.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import groovy.transform.CompileStatic
 import org.codehaus.groovy.control.CompilationUnit
 
diff --git a/src/test/groovy/bugs/Groovy965_Bug.groovy b/src/test/groovy/bugs/Groovy965_Bug.groovy
index 1a9a4ae..089a490 100644
--- a/src/test/groovy/bugs/Groovy965_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy965_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * A test case to ensure that Groovy can compile class names and variable names with non-ASCII
  * characters and that non-ASCII characters in Strings do the right thing.
diff --git a/src/test/groovy/bugs/Groovy996_Bug.groovy b/src/test/groovy/bugs/Groovy996_Bug.groovy
index ea50b4f..5e3175e 100644
--- a/src/test/groovy/bugs/Groovy996_Bug.groovy
+++ b/src/test/groovy/bugs/Groovy996_Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class Groovy996_Bug extends GroovyTestCase {
     void testAccessToSuperProtectedField() {
         def a = new Groovy996_SubClass()
diff --git a/src/test/groovy/bugs/GroovyInnerEnumBug.groovy b/src/test/groovy/bugs/GroovyInnerEnumBug.groovy
index adf69e0..28e105e 100644
--- a/src/test/groovy/bugs/GroovyInnerEnumBug.groovy
+++ b/src/test/groovy/bugs/GroovyInnerEnumBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class GroovyInnerEnumBug extends GroovyTestCase {
     static public enum MyEnum { 
         a, b, c
diff --git a/src/test/groovy/bugs/GuillaumesBug.groovy b/src/test/groovy/bugs/GuillaumesBug.groovy
index 168ad8d..c47aea0 100644
--- a/src/test/groovy/bugs/GuillaumesBug.groovy
+++ b/src/test/groovy/bugs/GuillaumesBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class GuillaumesBug extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/bugs/GuillaumesMapBug.groovy b/src/test/groovy/bugs/GuillaumesMapBug.groovy
index c3aa1b0..01784f5 100644
--- a/src/test/groovy/bugs/GuillaumesMapBug.groovy
+++ b/src/test/groovy/bugs/GuillaumesMapBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class GuillaumesMapBug extends GroovyTestCase {
     
     void testBug2() {
diff --git a/src/test/groovy/bugs/ImportNodeLineNumberTest.groovy b/src/test/groovy/bugs/ImportNodeLineNumberTest.groovy
index 1fcaf0d..f4d967a 100644
--- a/src/test/groovy/bugs/ImportNodeLineNumberTest.groovy
+++ b/src/test/groovy/bugs/ImportNodeLineNumberTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class ImportNodeLineNumberTest extends GroovyTestCase {
     void testLineNumberOfImports() {
         assertScript '''import groovy.transform.ASTTest
diff --git a/src/test/groovy/bugs/InconsistentStackHeightBug.groovy b/src/test/groovy/bugs/InconsistentStackHeightBug.groovy
index 200de65..37eefb2 100644
--- a/src/test/groovy/bugs/InconsistentStackHeightBug.groovy
+++ b/src/test/groovy/bugs/InconsistentStackHeightBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class InconsistentStackHeightBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/InterfaceImplBug.groovy b/src/test/groovy/bugs/InterfaceImplBug.groovy
index d1cbe99..5c188c9 100644
--- a/src/test/groovy/bugs/InterfaceImplBug.groovy
+++ b/src/test/groovy/bugs/InterfaceImplBug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.dummy.FooHandler
 
 class InterfaceImplBug extends GroovyTestCase implements FooHandler {
diff --git a/src/test/groovy/bugs/InvokeNormalMethodFromBuilder_Groovy657Bug.groovy b/src/test/groovy/bugs/InvokeNormalMethodFromBuilder_Groovy657Bug.groovy
index 609cabb..8034569 100644
--- a/src/test/groovy/bugs/InvokeNormalMethodFromBuilder_Groovy657Bug.groovy
+++ b/src/test/groovy/bugs/InvokeNormalMethodFromBuilder_Groovy657Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
   * Test that ensures that:
   * <ul>
diff --git a/src/test/groovy/bugs/MarkupAndMethodBug.groovy b/src/test/groovy/bugs/MarkupAndMethodBug.groovy
index 1c9031a..302ac21 100644
--- a/src/test/groovy/bugs/MarkupAndMethodBug.groovy
+++ b/src/test/groovy/bugs/MarkupAndMethodBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Mixes variables, closures and method calls in markup
  *
diff --git a/src/test/groovy/bugs/MetaClassCachingBug.groovy b/src/test/groovy/bugs/MetaClassCachingBug.groovy
index 9b65032..2153c6d 100644
--- a/src/test/groovy/bugs/MetaClassCachingBug.groovy
+++ b/src/test/groovy/bugs/MetaClassCachingBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class MetaClassCachingBug extends GroovyTestCase {
 
     protected void tearDown() {
diff --git a/src/test/groovy/bugs/MethodCallWithoutParensInStaticMethodBug.groovy b/src/test/groovy/bugs/MethodCallWithoutParensInStaticMethodBug.groovy
index 1f8d35f..eadb1a6 100644
--- a/src/test/groovy/bugs/MethodCallWithoutParensInStaticMethodBug.groovy
+++ b/src/test/groovy/bugs/MethodCallWithoutParensInStaticMethodBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class MethodCallWithoutParensInStaticMethodBug extends GroovyTestCase {
 
     void testBug() {
diff --git a/src/test/groovy/bugs/MethodClosureTest.groovy b/src/test/groovy/bugs/MethodClosureTest.groovy
index 1ce27fc..bdba5fd 100644
--- a/src/test/groovy/bugs/MethodClosureTest.groovy
+++ b/src/test/groovy/bugs/MethodClosureTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.MethodClosure
 
 class MethodClosureTest extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/MethodDispatchBug.groovy b/src/test/groovy/bugs/MethodDispatchBug.groovy
index 7e1620e..3a5a496 100644
--- a/src/test/groovy/bugs/MethodDispatchBug.groovy
+++ b/src/test/groovy/bugs/MethodDispatchBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class MethodDispatchBug extends GroovyTestCase {
     def doit(Object parameter1, Object parameter2) {
         "OO"
diff --git a/src/test/groovy/bugs/MethodPointerBug.groovy b/src/test/groovy/bugs/MethodPointerBug.groovy
index 0fc7d26..17b2b69 100644
--- a/src/test/groovy/bugs/MethodPointerBug.groovy
+++ b/src/test/groovy/bugs/MethodPointerBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class MethodPointerBug extends GroovyTestCase {
 
     void sayHello() {
diff --git a/src/test/groovy/bugs/MorgansBug.groovy b/src/test/groovy/bugs/MorgansBug.groovy
index 51e3f61..e8bdb79 100644
--- a/src/test/groovy/bugs/MorgansBug.groovy
+++ b/src/test/groovy/bugs/MorgansBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class MorgansBug extends GroovyTestCase {
 
     void testBug() {
diff --git a/src/test/groovy/bugs/NestedClosureBug.groovy b/src/test/groovy/bugs/NestedClosureBug.groovy
index 5721495..0091357 100644
--- a/src/test/groovy/bugs/NestedClosureBug.groovy
+++ b/src/test/groovy/bugs/NestedClosureBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class NestedClosureBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/NullAsBooleanCoercionTest.groovy b/src/test/groovy/bugs/NullAsBooleanCoercionTest.groovy
index 2394fd7..160865c 100644
--- a/src/test/groovy/bugs/NullAsBooleanCoercionTest.groovy
+++ b/src/test/groovy/bugs/NullAsBooleanCoercionTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * NullObject has no asBoolean() method,
  * making null.asBoolean() return true instead of false.
diff --git a/src/test/groovy/bugs/NullCompareBug.groovy b/src/test/groovy/bugs/NullCompareBug.groovy
index cdb0917..a973973 100644
--- a/src/test/groovy/bugs/NullCompareBug.groovy
+++ b/src/test/groovy/bugs/NullCompareBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class NullCompareBug extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/bugs/OverloadInvokeMethodBug.groovy b/src/test/groovy/bugs/OverloadInvokeMethodBug.groovy
index 6c909fe..9bb8b68 100644
--- a/src/test/groovy/bugs/OverloadInvokeMethodBug.groovy
+++ b/src/test/groovy/bugs/OverloadInvokeMethodBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
  
diff --git a/src/test/groovy/bugs/POJOCallSiteBug.groovy b/src/test/groovy/bugs/POJOCallSiteBug.groovy
index 7a4483e..5ba2e11 100644
--- a/src/test/groovy/bugs/POJOCallSiteBug.groovy
+++ b/src/test/groovy/bugs/POJOCallSiteBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class POJOCallSiteBug extends GroovyTestCase {
 
     MetaClassRegistry registry
diff --git a/src/test/groovy/bugs/PrimitivePropertyBug.groovy b/src/test/groovy/bugs/PrimitivePropertyBug.groovy
index 187f904..22e7ae8 100644
--- a/src/test/groovy/bugs/PrimitivePropertyBug.groovy
+++ b/src/test/groovy/bugs/PrimitivePropertyBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Fix Bug GROOVY-683
  */
diff --git a/src/test/groovy/bugs/PrintlnWithNewBug.groovy b/src/test/groovy/bugs/PrintlnWithNewBug.groovy
index 1c59bfb..079deb8 100644
--- a/src/test/groovy/bugs/PrintlnWithNewBug.groovy
+++ b/src/test/groovy/bugs/PrintlnWithNewBug.groovy
@@ -19,6 +19,7 @@
 package groovy.bugs
 
 import groovy.Foo
+import groovy.test.GroovyTestCase
 
 class PrintlnWithNewBug extends GroovyTestCase {
     
diff --git a/src/test/groovy/bugs/PropertyNameBug.groovy b/src/test/groovy/bugs/PropertyNameBug.groovy
index a54fb0f..c41d54e 100644
--- a/src/test/groovy/bugs/PropertyNameBug.groovy
+++ b/src/test/groovy/bugs/PropertyNameBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test to fix the issue GROOVY-843.
  */
diff --git a/src/test/groovy/bugs/RodsBooleanBug.groovy b/src/test/groovy/bugs/RodsBooleanBug.groovy
index a7738c0..3fa805c 100644
--- a/src/test/groovy/bugs/RodsBooleanBug.groovy
+++ b/src/test/groovy/bugs/RodsBooleanBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class RodsBooleanBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/RodsBug.groovy b/src/test/groovy/bugs/RodsBug.groovy
index b9ee14a..d5c3d76 100644
--- a/src/test/groovy/bugs/RodsBug.groovy
+++ b/src/test/groovy/bugs/RodsBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class RodsBug extends GroovyTestCase {
 
     void testBug() {
diff --git a/src/test/groovy/bugs/RussellsOptionalParenTest.groovy b/src/test/groovy/bugs/RussellsOptionalParenTest.groovy
index 6f7c165..b78fa0d 100644
--- a/src/test/groovy/bugs/RussellsOptionalParenTest.groovy
+++ b/src/test/groovy/bugs/RussellsOptionalParenTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class RussellsOptionalParenTest extends GroovyTestCase {
 
     void testMethodCallWithOneParam() {
diff --git a/src/test/groovy/bugs/SingleEvalTest.groovy b/src/test/groovy/bugs/SingleEvalTest.groovy
index 7b2b960..09a2e86 100644
--- a/src/test/groovy/bugs/SingleEvalTest.groovy
+++ b/src/test/groovy/bugs/SingleEvalTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class SingleEvalTest extends GroovyTestCase {
     int getArrayCount
     int getIndexCount
diff --git a/src/test/groovy/bugs/StaticClosurePropertyBug.groovy b/src/test/groovy/bugs/StaticClosurePropertyBug.groovy
index f08e00f..d0a05c3 100644
--- a/src/test/groovy/bugs/StaticClosurePropertyBug.groovy
+++ b/src/test/groovy/bugs/StaticClosurePropertyBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class StaticClosurePropertyBug extends GroovyTestCase {
 
     static def out = {System.out.println(it)}
diff --git a/src/test/groovy/bugs/StaticMethodCallBug.groovy b/src/test/groovy/bugs/StaticMethodCallBug.groovy
index 48638bd..07c6ccf 100644
--- a/src/test/groovy/bugs/StaticMethodCallBug.groovy
+++ b/src/test/groovy/bugs/StaticMethodCallBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /** 
  */
 class StaticMethodCallBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/StaticMethodImportBug.groovy b/src/test/groovy/bugs/StaticMethodImportBug.groovy
index 3e5c3cf..93f1bef 100644
--- a/src/test/groovy/bugs/StaticMethodImportBug.groovy
+++ b/src/test/groovy/bugs/StaticMethodImportBug.groovy
@@ -16,8 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.bugs;
+package groovy.bugs
 
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.dummy.*
 
 /**
diff --git a/src/test/groovy/bugs/StaticMethodImportGroovy935Bug.groovy b/src/test/groovy/bugs/StaticMethodImportGroovy935Bug.groovy
index cb145ed..b29030a 100644
--- a/src/test/groovy/bugs/StaticMethodImportGroovy935Bug.groovy
+++ b/src/test/groovy/bugs/StaticMethodImportGroovy935Bug.groovy
@@ -16,8 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.bugs;
+package groovy.bugs
 
+import groovy.test.GroovyTestCase;
 import org.codehaus.groovy.dummy.ClassWithStaticMethod
 
 /**
diff --git a/src/test/groovy/bugs/StaticPropertyBug.groovy b/src/test/groovy/bugs/StaticPropertyBug.groovy
index e08d463..991c068 100644
--- a/src/test/groovy/bugs/StaticPropertyBug.groovy
+++ b/src/test/groovy/bugs/StaticPropertyBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class StaticPropertyBug extends GroovyTestCase {
 
     MetaClassRegistry registry
diff --git a/src/test/groovy/bugs/SubscriptAndExpressionBug.groovy b/src/test/groovy/bugs/SubscriptAndExpressionBug.groovy
index dd8c3e4..185119b 100644
--- a/src/test/groovy/bugs/SubscriptAndExpressionBug.groovy
+++ b/src/test/groovy/bugs/SubscriptAndExpressionBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class SubscriptAndExpressionBug extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/bugs/SuperMethod2Bug.groovy b/src/test/groovy/bugs/SuperMethod2Bug.groovy
index 6fa5f35..093cb42 100644
--- a/src/test/groovy/bugs/SuperMethod2Bug.groovy
+++ b/src/test/groovy/bugs/SuperMethod2Bug.groovy
@@ -18,9 +18,10 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
- 
 class SuperMethod2Bug extends GroovyTestCase {
      
     void testBug() {
diff --git a/src/test/groovy/bugs/SuperMethodBug.groovy b/src/test/groovy/bugs/SuperMethodBug.groovy
index e88eaa6..1479621 100644
--- a/src/test/groovy/bugs/SuperMethodBug.groovy
+++ b/src/test/groovy/bugs/SuperMethodBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class SuperMethodBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy b/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy
index e20e065..ad0fb08 100644
--- a/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy
+++ b/src/test/groovy/bugs/SynchronizedBytecodeBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class SynchronizedBytecodeBug extends GroovyTestCase {
 
     /**
diff --git a/src/test/groovy/bugs/TernaryOperatorTest.groovy b/src/test/groovy/bugs/TernaryOperatorTest.groovy
index 59c2a52..fd740d6 100644
--- a/src/test/groovy/bugs/TernaryOperatorTest.groovy
+++ b/src/test/groovy/bugs/TernaryOperatorTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class TernaryOperatorBugTest extends GroovyTestCase {
     void testTernaryOperator() {
         assertScript '''
diff --git a/src/test/groovy/bugs/ToStringBug.groovy b/src/test/groovy/bugs/ToStringBug.groovy
index 3330f7b..f99785d 100644
--- a/src/test/groovy/bugs/ToStringBug.groovy
+++ b/src/test/groovy/bugs/ToStringBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class ToStringBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/TryCatch2Bug.groovy b/src/test/groovy/bugs/TryCatch2Bug.groovy
index 36b30a6..8f3f4d8 100644
--- a/src/test/groovy/bugs/TryCatch2Bug.groovy
+++ b/src/test/groovy/bugs/TryCatch2Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class TryCatch2Bug extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/bugs/TryCatchBug.groovy b/src/test/groovy/bugs/TryCatchBug.groovy
index f874562..bb88ab4 100644
--- a/src/test/groovy/bugs/TryCatchBug.groovy
+++ b/src/test/groovy/bugs/TryCatchBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class TryCatchBug extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/bugs/UnknownVariableBug.groovy b/src/test/groovy/bugs/UnknownVariableBug.groovy
index d626b3f..4730f5c 100644
--- a/src/test/groovy/bugs/UnknownVariableBug.groovy
+++ b/src/test/groovy/bugs/UnknownVariableBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class UnknownVariableBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/UseClosureInClosureBug.groovy b/src/test/groovy/bugs/UseClosureInClosureBug.groovy
index 0a01c72..62f4354 100644
--- a/src/test/groovy/bugs/UseClosureInClosureBug.groovy
+++ b/src/test/groovy/bugs/UseClosureInClosureBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class UseClosureInClosureBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/UseStaticInClosureBug.groovy b/src/test/groovy/bugs/UseStaticInClosureBug.groovy
index 191e698..a492510 100644
--- a/src/test/groovy/bugs/UseStaticInClosureBug.groovy
+++ b/src/test/groovy/bugs/UseStaticInClosureBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class UseStaticInClosureBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/VariablePrecedence.groovy b/src/test/groovy/bugs/VariablePrecedence.groovy
index 90f38c5..35fd358 100644
--- a/src/test/groovy/bugs/VariablePrecedence.groovy
+++ b/src/test/groovy/bugs/VariablePrecedence.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class VariblePrecedence extends GroovyTestCase {
     
     void testVariablePrecedence() {
diff --git a/src/test/groovy/bugs/VariablePrecedenceTest.groovy b/src/test/groovy/bugs/VariablePrecedenceTest.groovy
index 380d34e..c634cb2 100644
--- a/src/test/groovy/bugs/VariablePrecedenceTest.groovy
+++ b/src/test/groovy/bugs/VariablePrecedenceTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class VariablePrecedenceTest extends GroovyTestCase {
     def x = 100
     def y = 93
diff --git a/src/test/groovy/bugs/VerifyErrorBug.groovy b/src/test/groovy/bugs/VerifyErrorBug.groovy
index 7073032..572685d 100644
--- a/src/test/groovy/bugs/VerifyErrorBug.groovy
+++ b/src/test/groovy/bugs/VerifyErrorBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class VerifyErrorBug extends GroovyTestCase {
     void testShouldNotThrowVerifyError1() {
         assertScript """
diff --git a/src/test/groovy/bugs/WriteOnlyPropertyBug.groovy b/src/test/groovy/bugs/WriteOnlyPropertyBug.groovy
index 7a5455d..227fed8 100644
--- a/src/test/groovy/bugs/WriteOnlyPropertyBug.groovy
+++ b/src/test/groovy/bugs/WriteOnlyPropertyBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 /**
  */
 class WriteOnlyPropertyBug extends GroovyTestCase {
diff --git a/src/test/groovy/bugs/ZoharsBug.groovy b/src/test/groovy/bugs/ZoharsBug.groovy
index 5396a68..47b99ac 100644
--- a/src/test/groovy/bugs/ZoharsBug.groovy
+++ b/src/test/groovy/bugs/ZoharsBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs
 
+import groovy.test.GroovyTestCase
+
 class ZoharsBug extends GroovyTestCase {
     
     void testBug() {
diff --git a/src/test/groovy/bugs/groovy5912/otherpkg/Groovy5912Bug.groovy b/src/test/groovy/bugs/groovy5912/otherpkg/Groovy5912Bug.groovy
index b1fd605..d537453 100644
--- a/src/test/groovy/bugs/groovy5912/otherpkg/Groovy5912Bug.groovy
+++ b/src/test/groovy/bugs/groovy5912/otherpkg/Groovy5912Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs.groovy5912.otherpkg
 
+import groovy.test.GroovyTestCase
+
 class Groovy5912Bug extends GroovyTestCase {
     void test() {
         def errMsg = shouldFail '''
diff --git a/src/test/groovy/bugs/groovy6938/Groovy6938Bug.groovy b/src/test/groovy/bugs/groovy6938/Groovy6938Bug.groovy
index 8b6a6d0..b76ddda 100644
--- a/src/test/groovy/bugs/groovy6938/Groovy6938Bug.groovy
+++ b/src/test/groovy/bugs/groovy6938/Groovy6938Bug.groovy
@@ -19,6 +19,8 @@
 
 package groovy.bugs.groovy6938
 
+import groovy.test.GroovyTestCase
+
 class Groovy6938Bug extends GroovyTestCase {
     void test() {
         assert null == new L().doSomething()
diff --git a/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy b/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
index 53a71f2..8b09a30 100644
--- a/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
+++ b/src/test/groovy/bugs/groovy8531/Groovy8531Bug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs.groovy8531
 
+import groovy.test.GroovyTestCase
+
 class Groovy8531Bug extends GroovyTestCase {
     void testPublicAndProtectedInnerType() {
         assertScript '''
diff --git a/src/test/groovy/bugs/groovy8757/UsageTest.groovy b/src/test/groovy/bugs/groovy8757/UsageTest.groovy
index 321820e..0c385dd 100644
--- a/src/test/groovy/bugs/groovy8757/UsageTest.groovy
+++ b/src/test/groovy/bugs/groovy8757/UsageTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs.groovy8757
 
+import groovy.test.GroovyTestCase
+
 class UsageTest extends GroovyTestCase {
     void testAccessingPrecompiledTraitWithMethodGenerics() {
         def c0 = new GroovyShell().evaluate('''
diff --git a/src/test/groovy/bugs/groovy8953/SyntheticParameterAnnotationsBug.groovy b/src/test/groovy/bugs/groovy8953/SyntheticParameterAnnotationsBug.groovy
index 316e5b9..9ba5c1e 100644
--- a/src/test/groovy/bugs/groovy8953/SyntheticParameterAnnotationsBug.groovy
+++ b/src/test/groovy/bugs/groovy8953/SyntheticParameterAnnotationsBug.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.bugs.groovy8953
 
+import groovy.test.GroovyTestCase
+
 class SyntheticParameterAnnotationsBug extends GroovyTestCase {
     void testEnumConstructorWithSyntheticParamUsageWithAsmResolvingDisabled() {
         assertScript '''
diff --git a/src/test/groovy/bugs/groovy9236/Groovy9236Bug.groovy b/src/test/groovy/bugs/groovy9236/Groovy9236Bug.groovy
index 0ad30d0..393cfb5 100644
--- a/src/test/groovy/bugs/groovy9236/Groovy9236Bug.groovy
+++ b/src/test/groovy/bugs/groovy9236/Groovy9236Bug.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.bugs.groovy9236
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.tools.GroovyStarter
 
 class Groovy9236Bug extends GroovyTestCase {
diff --git a/src/test/groovy/execute/ExecuteTest.groovy b/src/test/groovy/execute/ExecuteTest.groovy
index d654c1d..53c88e1 100644
--- a/src/test/groovy/execute/ExecuteTest.groovy
+++ b/src/test/groovy/execute/ExecuteTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.execute
 
+import groovy.test.GroovyTestCase
+
 import static groovy.test.GroovyAssert.isAtLeastJdk
 
 /**
diff --git a/src/test/groovy/execute/ExecuteTest_LinuxSolaris.groovy b/src/test/groovy/execute/ExecuteTest_LinuxSolaris.groovy
index 338bd8b..803ee2f 100644
--- a/src/test/groovy/execute/ExecuteTest_LinuxSolaris.groovy
+++ b/src/test/groovy/execute/ExecuteTest_LinuxSolaris.groovy
@@ -21,6 +21,7 @@
 
 package groovy.execute
 
+import groovy.test.GroovyTestCase
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/src/test/groovy/execute/ExecuteTest_Windows.groovy b/src/test/groovy/execute/ExecuteTest_Windows.groovy
index 49d994f..a30449a 100644
--- a/src/test/groovy/execute/ExecuteTest_Windows.groovy
+++ b/src/test/groovy/execute/ExecuteTest_Windows.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.execute
 
+import groovy.test.GroovyTestCase
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/src/test/groovy/gpath/GPathTest.groovy b/src/test/groovy/gpath/GPathTest.groovy
index fefbb4b..57e0a1c 100644
--- a/src/test/groovy/gpath/GPathTest.groovy
+++ b/src/test/groovy/gpath/GPathTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.gpath
 
+import groovy.test.GroovyTestCase
+
 /**
  * Some GPath tests using maps and lists
  */
diff --git a/src/test/groovy/gpath/NodeGPathTest.groovy b/src/test/groovy/gpath/NodeGPathTest.groovy
index 5690376..31791e0 100644
--- a/src/test/groovy/gpath/NodeGPathTest.groovy
+++ b/src/test/groovy/gpath/NodeGPathTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.gpath
 
+import groovy.test.GroovyTestCase
+
 /**
  * Some GPath tests using trees
  */
diff --git a/src/test/groovy/grape/GrabErrorIsolationTest.groovy b/src/test/groovy/grape/GrabErrorIsolationTest.groovy
index c355345..4bd6646 100644
--- a/src/test/groovy/grape/GrabErrorIsolationTest.groovy
+++ b/src/test/groovy/grape/GrabErrorIsolationTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.grape
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test for GROOVY-3853. Kept with other grab tests and not normally
  * run unless -Djunit.network=true is set on command line.
diff --git a/src/test/groovy/grape/GrabExcludeTest.groovy b/src/test/groovy/grape/GrabExcludeTest.groovy
index ec946d6..1872103 100644
--- a/src/test/groovy/grape/GrabExcludeTest.groovy
+++ b/src/test/groovy/grape/GrabExcludeTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.grape
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
 
 class GrabExcludeTest extends GroovyTestCase {
diff --git a/src/test/groovy/grape/GrabResolverTest.groovy b/src/test/groovy/grape/GrabResolverTest.groovy
index da4f09a..369f10b 100644
--- a/src/test/groovy/grape/GrabResolverTest.groovy
+++ b/src/test/groovy/grape/GrabResolverTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.grape
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.CompilationFailedException
 
 class GrabResolverTest extends GroovyTestCase {
diff --git a/src/test/groovy/grape/GrapeClassLoaderTest.groovy b/src/test/groovy/grape/GrapeClassLoaderTest.groovy
index d70868c..dc2ccfa 100644
--- a/src/test/groovy/grape/GrapeClassLoaderTest.groovy
+++ b/src/test/groovy/grape/GrapeClassLoaderTest.groovy
@@ -17,6 +17,9 @@
  *  under the License.
  */
 package groovy.grape
+
+import groovy.test.GroovyTestCase
+
 /**
  * Created by IntelliJ IDEA.
  * User: Danno
diff --git a/src/test/groovy/io/LineColumnReaderTest.groovy b/src/test/groovy/io/LineColumnReaderTest.groovy
index b7ff52d..3e58c02 100644
--- a/src/test/groovy/io/LineColumnReaderTest.groovy
+++ b/src/test/groovy/io/LineColumnReaderTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.io
 
+import groovy.test.GroovyTestCase
+
 import java.nio.CharBuffer
 
 class LineColumnReaderTest extends GroovyTestCase {
diff --git a/src/test/groovy/lang/BenchmarkInterceptorTest.groovy b/src/test/groovy/lang/BenchmarkInterceptorTest.groovy
index ceeece7..98c7a78 100644
--- a/src/test/groovy/lang/BenchmarkInterceptorTest.groovy
+++ b/src/test/groovy/lang/BenchmarkInterceptorTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test for the BenchmarkInterceptor
  */
diff --git a/src/test/groovy/lang/CategoryAnnotationTest.groovy b/src/test/groovy/lang/CategoryAnnotationTest.groovy
index ca9e32b..1627838 100644
--- a/src/test/groovy/lang/CategoryAnnotationTest.groovy
+++ b/src/test/groovy/lang/CategoryAnnotationTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 class CategoryAnnotationTest extends GroovyTestCase {
     void testTransformationOfPropertyInvokedOnThis() {
         //Test the fix for GROOVY-3367
diff --git a/src/test/groovy/lang/ClassReloadingTest.groovy b/src/test/groovy/lang/ClassReloadingTest.groovy
index e6b4ccd..be0e545 100644
--- a/src/test/groovy/lang/ClassReloadingTest.groovy
+++ b/src/test/groovy/lang/ClassReloadingTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.CompilerConfiguration
 
 class ClassReloadingTest extends GroovyTestCase {
diff --git a/src/test/groovy/lang/ClosureResolvingTest.groovy b/src/test/groovy/lang/ClosureResolvingTest.groovy
index 64e3ea2..14f27a2 100644
--- a/src/test/groovy/lang/ClosureResolvingTest.groovy
+++ b/src/test/groovy/lang/ClosureResolvingTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests how closures resolve to either a delegate or an owner for a given resolveStrategy
  *
diff --git a/src/test/groovy/lang/DelegatingMetaClassTest.groovy b/src/test/groovy/lang/DelegatingMetaClassTest.groovy
index 4607069..8d23ca0 100644
--- a/src/test/groovy/lang/DelegatingMetaClassTest.groovy
+++ b/src/test/groovy/lang/DelegatingMetaClassTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests for the DelegatingMetaClass
  */
diff --git a/src/test/groovy/lang/ExceptionTest.groovy b/src/test/groovy/lang/ExceptionTest.groovy
index 565354f..96506c5 100644
--- a/src/test/groovy/lang/ExceptionTest.groovy
+++ b/src/test/groovy/lang/ExceptionTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 public class ExceptionTest extends GroovyTestCase {
 
     private int finallyCounter;
diff --git a/src/test/groovy/lang/ExpandoMetaClassConstructorTest.groovy b/src/test/groovy/lang/ExpandoMetaClassConstructorTest.groovy
index f01e63f..1ce05f3 100644
--- a/src/test/groovy/lang/ExpandoMetaClassConstructorTest.groovy
+++ b/src/test/groovy/lang/ExpandoMetaClassConstructorTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 class ExpandoMetaClassConstructorTest extends GroovyTestCase {
     void testVariousConstructorForms() {
         try {
diff --git a/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy b/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy
index 172f7a7..159bd4d 100644
--- a/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy
+++ b/src/test/groovy/lang/ExpandoMetaClassCreationHandleTest.groovy
@@ -16,7 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.lang;
+package groovy.lang
+
+import groovy.test.GroovyTestCase;
 
 class ExpandoMetaClassCreationHandleTest extends GroovyTestCase {
     def registry = GroovySystem.metaClassRegistry
diff --git a/src/test/groovy/lang/ExpandoMetaClassTest.groovy b/src/test/groovy/lang/ExpandoMetaClassTest.groovy
index f285ad4..5d996b8 100644
--- a/src/test/groovy/lang/ExpandoMetaClassTest.groovy
+++ b/src/test/groovy/lang/ExpandoMetaClassTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 class ExpandoMetaClassTest extends GroovyTestCase {
 
     @Override
diff --git a/src/test/groovy/lang/GetMethodsTest.groovy b/src/test/groovy/lang/GetMethodsTest.groovy
index da079d6..b95e176 100644
--- a/src/test/groovy/lang/GetMethodsTest.groovy
+++ b/src/test/groovy/lang/GetMethodsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests the behaviour of the runtime evaluating methods of Groovy's MetaClass system
  *
diff --git a/src/test/groovy/lang/GroovyClassLoaderTest.groovy b/src/test/groovy/lang/GroovyClassLoaderTest.groovy
index 27ec8aa..9466beb 100644
--- a/src/test/groovy/lang/GroovyClassLoaderTest.groovy
+++ b/src/test/groovy/lang/GroovyClassLoaderTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.ast.ClassHelper
 import org.codehaus.groovy.ast.ClassNode
 import org.codehaus.groovy.ast.CompileUnit
@@ -119,7 +120,7 @@ class GroovyClassLoaderTest extends GroovyTestCase implements Opcodes {
 
             def name = file.name - ".groovy"
             def script = """
-            class $name extends GroovyTestCase{}
+            class $name extends groovy.test.GroovyTestCase{}
           """
             file << script
             paths << file.parentFile.toURL()
diff --git a/src/test/groovy/lang/GroovyCodeSourceTest.groovy b/src/test/groovy/lang/GroovyCodeSourceTest.groovy
index 9f8422f..f3be18a 100644
--- a/src/test/groovy/lang/GroovyCodeSourceTest.groovy
+++ b/src/test/groovy/lang/GroovyCodeSourceTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 class GroovyCodeSourceTest extends GroovyTestCase {
     void testValidEncoding() {
         new GroovyCodeSource(createTemporaryGroovyClassFile(), "UTF-8")
diff --git a/src/test/groovy/lang/GroovyShellTest2.groovy b/src/test/groovy/lang/GroovyShellTest2.groovy
index 27259bf..bdd3b64 100644
--- a/src/test/groovy/lang/GroovyShellTest2.groovy
+++ b/src/test/groovy/lang/GroovyShellTest2.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Created by jim on 8/14/14.
  */
diff --git a/src/test/groovy/lang/GroovySystemTest.groovy b/src/test/groovy/lang/GroovySystemTest.groovy
index 448247d..5d99691 100644
--- a/src/test/groovy/lang/GroovySystemTest.groovy
+++ b/src/test/groovy/lang/GroovySystemTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests for the GroovySystem class
  */
diff --git a/src/test/groovy/lang/InnerClassResolvingTest.groovy b/src/test/groovy/lang/InnerClassResolvingTest.groovy
index 427d3f8..873a241 100644
--- a/src/test/groovy/lang/InnerClassResolvingTest.groovy
+++ b/src/test/groovy/lang/InnerClassResolvingTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 class InnerClassResolvingTest extends GroovyTestCase {
     void testInnerClass() {
         // Thread.UncaughtExceptionHandler was added in Java 1.5
diff --git a/src/test/groovy/lang/IntRangeTest.groovy b/src/test/groovy/lang/IntRangeTest.groovy
index 09589c7..c7fa51c 100644
--- a/src/test/groovy/lang/IntRangeTest.groovy
+++ b/src/test/groovy/lang/IntRangeTest.groovy
@@ -16,7 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package groovy.lang;
+package groovy.lang
+
+import groovy.test.GroovyTestCase;
 
 /**
  * Provides unit tests for the <code>IntRange</code> class.
diff --git a/src/test/groovy/lang/InterceptorTest.groovy b/src/test/groovy/lang/InterceptorTest.groovy
index 3d74369..13db0ff 100644
--- a/src/test/groovy/lang/InterceptorTest.groovy
+++ b/src/test/groovy/lang/InterceptorTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.runtime.StringBufferWriter
 
 /**
diff --git a/src/test/groovy/lang/MapOfClosureTest.groovy b/src/test/groovy/lang/MapOfClosureTest.groovy
index 3a1cc11..9fd4e83 100644
--- a/src/test/groovy/lang/MapOfClosureTest.groovy
+++ b/src/test/groovy/lang/MapOfClosureTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests maps of closures coerced to classes by asType()
  */
diff --git a/src/test/groovy/lang/MetaClassPropertyTest.groovy b/src/test/groovy/lang/MetaClassPropertyTest.groovy
index e20d22c..fa5b2df 100644
--- a/src/test/groovy/lang/MetaClassPropertyTest.groovy
+++ b/src/test/groovy/lang/MetaClassPropertyTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 class MetaClassPropertyTest extends GroovyTestCase {
 
     void testForJavaClass() {
diff --git a/src/test/groovy/lang/MetaClassRegistryTest.groovy b/src/test/groovy/lang/MetaClassRegistryTest.groovy
index 83d4f13..79f4733 100644
--- a/src/test/groovy/lang/MetaClassRegistryTest.groovy
+++ b/src/test/groovy/lang/MetaClassRegistryTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * GROOVY-2875: MetaClassRegistryImpl constantMetaClasses map is leaking resources
  * GROOVY-4481: the listener and iterator mechanism over the MetaClassRegistry wasn't working.
diff --git a/src/test/groovy/lang/MethodMissingTest.groovy b/src/test/groovy/lang/MethodMissingTest.groovy
index c519fc4..9aa805f 100644
--- a/src/test/groovy/lang/MethodMissingTest.groovy
+++ b/src/test/groovy/lang/MethodMissingTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests for method missing handling in Groovy
  *
diff --git a/src/test/groovy/lang/MixinAnnotationTest.groovy b/src/test/groovy/lang/MixinAnnotationTest.groovy
index 844041a..6aa66ef 100644
--- a/src/test/groovy/lang/MixinAnnotationTest.groovy
+++ b/src/test/groovy/lang/MixinAnnotationTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyShellTestCase
 import org.codehaus.groovy.reflection.ReflectionCache
 
 class MixinAnnotationTest extends GroovyShellTestCase {
@@ -47,7 +48,7 @@ class ClassToExtend implements Mixed{
     def a = "blah"
 }
 
-        GroovyTestCase.assertEquals("under category: object of ClassToExtend: blah", new ClassToExtend().asText ())
+        groovy.test.GroovyTestCase.assertEquals("under category: object of ClassToExtend: blah", new ClassToExtend().asText ())
 
         boolean failed = false;
         try {
@@ -84,7 +85,7 @@ class ClassToExtend {
     }
 }
 
-        GroovyTestCase.assertEquals("under category: under BIG category: object of ClassToExtend", new ClassToExtend().asText ())
+        groovy.test.GroovyTestCase.assertEquals("under category: under BIG category: object of ClassToExtend", new ClassToExtend().asText ())
         """
     }
 
diff --git a/src/test/groovy/lang/MixinTest.groovy b/src/test/groovy/lang/MixinTest.groovy
index 33dd64e..c67a8d1 100644
--- a/src/test/groovy/lang/MixinTest.groovy
+++ b/src/test/groovy/lang/MixinTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 import java.util.concurrent.locks.ReentrantLock
 import org.codehaus.groovy.reflection.ClassInfo
 
diff --git a/src/test/groovy/lang/PropertyMissingTest.groovy b/src/test/groovy/lang/PropertyMissingTest.groovy
index 7016464..3dcbbb0 100644
--- a/src/test/groovy/lang/PropertyMissingTest.groovy
+++ b/src/test/groovy/lang/PropertyMissingTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests the behaviour of the propertyMissing functionality of Groovy
  *
diff --git a/src/test/groovy/lang/ReferenceSerializationTest.groovy b/src/test/groovy/lang/ReferenceSerializationTest.groovy
index 603cf12..51a06cd 100644
--- a/src/test/groovy/lang/ReferenceSerializationTest.groovy
+++ b/src/test/groovy/lang/ReferenceSerializationTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * GROOVY-4305: Make groovy.lang.Reference implement Serializable
  */
diff --git a/src/test/groovy/lang/RespondsToTest.groovy b/src/test/groovy/lang/RespondsToTest.groovy
index 890ed44..ef0a70a 100644
--- a/src/test/groovy/lang/RespondsToTest.groovy
+++ b/src/test/groovy/lang/RespondsToTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests the respondsTo functionality of Groovy
  *
diff --git a/src/test/groovy/lang/ScriptCacheTest.groovy b/src/test/groovy/lang/ScriptCacheTest.groovy
index 929fb82..4f8c2a8 100644
--- a/src/test/groovy/lang/ScriptCacheTest.groovy
+++ b/src/test/groovy/lang/ScriptCacheTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 class ScriptCacheTest extends GroovyTestCase {
 
     def packageName = "scriptcachetest"
diff --git a/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy b/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy
index d550ddb..9c96f21 100644
--- a/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy
+++ b/src/test/groovy/lang/ScriptSourcePositionInAstTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
 import org.codehaus.groovy.control.CompilationUnit
 import org.codehaus.groovy.control.Phases
 
diff --git a/src/test/groovy/lang/StringConcatTest.groovy b/src/test/groovy/lang/StringConcatTest.groovy
index bf0a841..143f27d 100644
--- a/src/test/groovy/lang/StringConcatTest.groovy
+++ b/src/test/groovy/lang/StringConcatTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 class StringConcatTest extends GroovyTestCase{
   void testMe () {
 //      def x = new Object()
diff --git a/src/test/groovy/lang/StripMarginTest.groovy b/src/test/groovy/lang/StripMarginTest.groovy
index 2215fbc..9862b4b 100644
--- a/src/test/groovy/lang/StripMarginTest.groovy
+++ b/src/test/groovy/lang/StripMarginTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 class StripMarginTest extends GroovyTestCase {
     void testStripMarginOnSingleLineString() {
         def expected = "the quick brown fox jumps over the lazy dog"
diff --git a/src/test/groovy/lang/SyntheticReturnTest.groovy b/src/test/groovy/lang/SyntheticReturnTest.groovy
index 2176ab7..b0ab966 100644
--- a/src/test/groovy/lang/SyntheticReturnTest.groovy
+++ b/src/test/groovy/lang/SyntheticReturnTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyShellTestCase
+
 class SyntheticReturnTest extends GroovyShellTestCase{
 
     // GROOVY-5980
diff --git a/src/test/groovy/lang/TapMethodTest.groovy b/src/test/groovy/lang/TapMethodTest.groovy
index 95e4774..c947f8c 100644
--- a/src/test/groovy/lang/TapMethodTest.groovy
+++ b/src/test/groovy/lang/TapMethodTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests the .tap method
  */
diff --git a/src/test/groovy/lang/WithMethodTest.groovy b/src/test/groovy/lang/WithMethodTest.groovy
index d93ea48..f6da0d9 100644
--- a/src/test/groovy/lang/WithMethodTest.groovy
+++ b/src/test/groovy/lang/WithMethodTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.lang
 
+import groovy.test.GroovyTestCase
+
 /**
  * Tests the .with method
  */
diff --git a/src/test/groovy/mock/example/SandwichMakerTest.groovy b/src/test/groovy/mock/example/SandwichMakerTest.groovy
index 941f859..57e3501 100644
--- a/src/test/groovy/mock/example/SandwichMakerTest.groovy
+++ b/src/test/groovy/mock/example/SandwichMakerTest.groovy
@@ -19,6 +19,7 @@
 package groovy.mock.example
 
 import groovy.mock.interceptor.MockFor
+import groovy.test.GroovyTestCase
 
 class SandwichMakerTest extends GroovyTestCase {
 
diff --git a/src/test/groovy/mock/interceptor/HalfMockTest.groovy b/src/test/groovy/mock/interceptor/HalfMockTest.groovy
index a0b53d2..4e73753 100644
--- a/src/test/groovy/mock/interceptor/HalfMockTest.groovy
+++ b/src/test/groovy/mock/interceptor/HalfMockTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.mock.interceptor
 
+import groovy.test.GroovyTestCase
+
 class HalfMockTest extends GroovyTestCase {
 
     void setUp() {
diff --git a/src/test/groovy/mock/interceptor/MockCallSequenceTest.groovy b/src/test/groovy/mock/interceptor/MockCallSequenceTest.groovy
index b7cfe1f..f0c03c7 100644
--- a/src/test/groovy/mock/interceptor/MockCallSequenceTest.groovy
+++ b/src/test/groovy/mock/interceptor/MockCallSequenceTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.mock.interceptor
 
+import groovy.test.GroovyTestCase
 import junit.framework.AssertionFailedError
 
 /**
diff --git a/src/test/groovy/mock/interceptor/MockForJavaTest.groovy b/src/test/groovy/mock/interceptor/MockForJavaTest.groovy
index 4522161..40d2e3c 100644
--- a/src/test/groovy/mock/interceptor/MockForJavaTest.groovy
+++ b/src/test/groovy/mock/interceptor/MockForJavaTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.mock.interceptor
 
+import groovy.test.GroovyTestCase
+
 class MockForJavaTest extends GroovyTestCase {
     void testIterator() {
         def iteratorContext = new MockFor(Iterator)
diff --git a/src/test/groovy/mock/interceptor/MockNestedCallTest.groovy b/src/test/groovy/mock/interceptor/MockNestedCallTest.groovy
index caf5412..d81ddeb 100644
--- a/src/test/groovy/mock/interceptor/MockNestedCallTest.groovy
+++ b/src/test/groovy/mock/interceptor/MockNestedCallTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.mock.interceptor
 
+import groovy.test.GroovyTestCase
+
 class MockNestedCallTest extends GroovyTestCase {
 
     void testRestore() {
diff --git a/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy b/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy
index 36f8605..4f49d89 100644
--- a/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy
+++ b/src/test/groovy/mock/interceptor/MockSingleCallTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.mock.interceptor
 
+import groovy.test.GroovyTestCase
 import junit.framework.AssertionFailedError
 
 /**
diff --git a/src/test/groovy/mock/interceptor/MockWithZeroRangeTest.groovy b/src/test/groovy/mock/interceptor/MockWithZeroRangeTest.groovy
index 889c353..e6b3e8b 100644
--- a/src/test/groovy/mock/interceptor/MockWithZeroRangeTest.groovy
+++ b/src/test/groovy/mock/interceptor/MockWithZeroRangeTest.groovy
@@ -19,6 +19,7 @@
 package groovy.mock.interceptor
 
 import groovy.mock.interceptor.MockFor
+import groovy.test.GroovyTestCase
 import junit.framework.AssertionFailedError
 
 class MockForWithZeroRangeTest extends GroovyTestCase {
diff --git a/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy b/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy
index 1011743..89fba03 100644
--- a/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy
+++ b/src/test/groovy/mock/interceptor/StubCallSequenceTest.groovy
@@ -18,6 +18,7 @@
  */
 package groovy.mock.interceptor
 
+import groovy.test.GroovyTestCase
 import junit.framework.AssertionFailedError
 
 /**
diff --git a/src/test/groovy/mock/interceptor/StubForJavaTest.groovy b/src/test/groovy/mock/interceptor/StubForJavaTest.groovy
index f7b966c..10269a4 100644
--- a/src/test/groovy/mock/interceptor/StubForJavaTest.groovy
+++ b/src/test/groovy/mock/interceptor/StubForJavaTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.mock.interceptor
 
+import groovy.test.GroovyTestCase
+
 class StubForJavaTest extends GroovyTestCase {
     void testIterator() {
 //        ProxyGenerator.INSTANCE.debug = true
diff --git a/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy b/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy
index 3785175..a956e1d 100644
--- a/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy
+++ b/src/test/groovy/mock/interceptor/StubSingleCallTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.mock.interceptor
 
+import groovy.test.GroovyTestCase
+
 /**
  * Testing Groovy Stub support for single calls to the Collaborator
  */
diff --git a/src/test/groovy/mock/interceptor/StubTest.groovy b/src/test/groovy/mock/interceptor/StubTest.groovy
index 13700ff..a283141 100644
--- a/src/test/groovy/mock/interceptor/StubTest.groovy
+++ b/src/test/groovy/mock/interceptor/StubTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.mock.interceptor
 
+import groovy.test.GroovyTestCase
+
 class StubTest extends GroovyTestCase {
 
    void testBehaviorWithInstanceCreatedOutsideUseClosure() {
diff --git a/src/test/groovy/operator/BigDecimalOperatorsTest.groovy b/src/test/groovy/operator/BigDecimalOperatorsTest.groovy
index ace3194..be916c8 100644
--- a/src/test/groovy/operator/BigDecimalOperatorsTest.groovy
+++ b/src/test/groovy/operator/BigDecimalOperatorsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.operator
 
+import groovy.test.GroovyTestCase
+
 class BigDecimalOperatorsTest extends GroovyTestCase {
 
     def x, y
diff --git a/src/test/groovy/operator/BigIntegerOperationsTest.groovy b/src/test/groovy/operator/BigIntegerOperationsTest.groovy
index 21f79e8..3a0e936 100644
--- a/src/test/groovy/operator/BigIntegerOperationsTest.groovy
+++ b/src/test/groovy/operator/BigIntegerOperationsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.operator
 
+import groovy.test.GroovyTestCase
+
 class BigIntegerOperationsTest extends GroovyTestCase {
     void testAssign() {
         BigInteger foo
diff --git a/src/test/groovy/operator/BitwiseOperatorsTest.groovy b/src/test/groovy/operator/BitwiseOperatorsTest.groovy
index fc5c719..08f1500 100644
--- a/src/test/groovy/operator/BitwiseOperatorsTest.groovy
+++ b/src/test/groovy/operator/BitwiseOperatorsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.operator
 
+import groovy.test.GroovyTestCase
+
 /**
  * Test Bitwise Operations
  */
diff --git a/src/test/groovy/operator/BooleanOperationsTest.groovy b/src/test/groovy/operator/BooleanOperationsTest.groovy
index d062e73..c578af4 100644
--- a/src/test/groovy/operator/BooleanOperationsTest.groovy
+++ b/src/test/groovy/operator/BooleanOperationsTest.groovy
@@ -18,6 +18,8 @@
  */
 package groovy.operator
 
+import groovy.test.GroovyTestCase
+
 class BooleanOperationsTest extends GroovyTestCase {
 
     void testComparisons() {
diff --git a/src/test/groovy/operator/DoubleOperationTest.groovy b/src/test/groovy/operator/DoubleOperationTest.groovy
... 2924 lines suppressed ...


Mime
View raw message