diff --git a/compiler/testData/diagnostics/quick/Abstract.jet b/compiler/testData/diagnostics/tests/Abstract.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Abstract.jet
rename to compiler/testData/diagnostics/tests/Abstract.jet
diff --git a/compiler/testData/diagnostics/quick/AnonymousInitializerVarAndConstructor.jet b/compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/AnonymousInitializerVarAndConstructor.jet
rename to compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.jet
diff --git a/compiler/testData/diagnostics/quick/AnonymousInitializers.jet b/compiler/testData/diagnostics/tests/AnonymousInitializers.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/AnonymousInitializers.jet
rename to compiler/testData/diagnostics/tests/AnonymousInitializers.jet
diff --git a/compiler/testData/diagnostics/quick/AutoCreatedIt.jet b/compiler/testData/diagnostics/tests/AutoCreatedIt.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/AutoCreatedIt.jet
rename to compiler/testData/diagnostics/tests/AutoCreatedIt.jet
diff --git a/compiler/testData/diagnostics/quick/AutocastAmbiguitites.jet b/compiler/testData/diagnostics/tests/AutocastAmbiguitites.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/AutocastAmbiguitites.jet
rename to compiler/testData/diagnostics/tests/AutocastAmbiguitites.jet
diff --git a/compiler/testData/diagnostics/quick/AutocastsForStableIdentifiers.jet b/compiler/testData/diagnostics/tests/AutocastsForStableIdentifiers.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/AutocastsForStableIdentifiers.jet
rename to compiler/testData/diagnostics/tests/AutocastsForStableIdentifiers.jet
diff --git a/compiler/testData/diagnostics/quick/Basic.jet b/compiler/testData/diagnostics/tests/Basic.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Basic.jet
rename to compiler/testData/diagnostics/tests/Basic.jet
diff --git a/compiler/testData/diagnostics/quick/BinaryCallsOnNullableValues.jet b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/BinaryCallsOnNullableValues.jet
rename to compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.jet
diff --git a/compiler/testData/diagnostics/quick/Bounds.jet b/compiler/testData/diagnostics/tests/Bounds.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Bounds.jet
rename to compiler/testData/diagnostics/tests/Bounds.jet
diff --git a/compiler/testData/diagnostics/quick/BreakContinue.jet b/compiler/testData/diagnostics/tests/BreakContinue.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/BreakContinue.jet
rename to compiler/testData/diagnostics/tests/BreakContinue.jet
diff --git a/compiler/testData/diagnostics/quick/Builders.jet b/compiler/testData/diagnostics/tests/Builders.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Builders.jet
rename to compiler/testData/diagnostics/tests/Builders.jet
diff --git a/compiler/testData/diagnostics/quick/Casts.jet b/compiler/testData/diagnostics/tests/Casts.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Casts.jet
rename to compiler/testData/diagnostics/tests/Casts.jet
diff --git a/compiler/testData/diagnostics/quick/ClassObjectCannotAccessClassFields.jet b/compiler/testData/diagnostics/tests/ClassObjectCannotAccessClassFields.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ClassObjectCannotAccessClassFields.jet
rename to compiler/testData/diagnostics/tests/ClassObjectCannotAccessClassFields.jet
diff --git a/compiler/testData/diagnostics/quick/ClassObjects.jet b/compiler/testData/diagnostics/tests/ClassObjects.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ClassObjects.jet
rename to compiler/testData/diagnostics/tests/ClassObjects.jet
diff --git a/compiler/testData/diagnostics/quick/ConflictingOverloads.jet b/compiler/testData/diagnostics/tests/ConflictingOverloads.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ConflictingOverloads.jet
rename to compiler/testData/diagnostics/tests/ConflictingOverloads.jet
diff --git a/compiler/testData/diagnostics/quick/Constants.jet b/compiler/testData/diagnostics/tests/Constants.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Constants.jet
rename to compiler/testData/diagnostics/tests/Constants.jet
diff --git a/compiler/testData/diagnostics/quick/Constructors.jet b/compiler/testData/diagnostics/tests/Constructors.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Constructors.jet
rename to compiler/testData/diagnostics/tests/Constructors.jet
diff --git a/compiler/testData/diagnostics/quick/CovariantOverrideType.jet b/compiler/testData/diagnostics/tests/CovariantOverrideType.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/CovariantOverrideType.jet
rename to compiler/testData/diagnostics/tests/CovariantOverrideType.jet
diff --git a/compiler/testData/diagnostics/quick/CyclicHierarchy.jet b/compiler/testData/diagnostics/tests/CyclicHierarchy.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/CyclicHierarchy.jet
rename to compiler/testData/diagnostics/tests/CyclicHierarchy.jet
diff --git a/compiler/testData/diagnostics/quick/DefaultValuesTypechecking.jet b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/DefaultValuesTypechecking.jet
rename to compiler/testData/diagnostics/tests/DefaultValuesTypechecking.jet
diff --git a/compiler/testData/diagnostics/quick/DeferredTypes.jet b/compiler/testData/diagnostics/tests/DeferredTypes.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/DeferredTypes.jet
rename to compiler/testData/diagnostics/tests/DeferredTypes.jet
diff --git a/compiler/testData/diagnostics/quick/DelegationAndOverriding.jet b/compiler/testData/diagnostics/tests/DelegationAndOverriding.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/DelegationAndOverriding.jet
rename to compiler/testData/diagnostics/tests/DelegationAndOverriding.jet
diff --git a/compiler/testData/diagnostics/quick/DelegationNotTotrait.jet b/compiler/testData/diagnostics/tests/DelegationNotTotrait.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/DelegationNotTotrait.jet
rename to compiler/testData/diagnostics/tests/DelegationNotTotrait.jet
diff --git a/compiler/testData/diagnostics/quick/Dollar.jet b/compiler/testData/diagnostics/tests/Dollar.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Dollar.jet
rename to compiler/testData/diagnostics/tests/Dollar.jet
diff --git a/compiler/testData/diagnostics/quick/Enums.jet b/compiler/testData/diagnostics/tests/Enums.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Enums.jet
rename to compiler/testData/diagnostics/tests/Enums.jet
diff --git a/compiler/testData/diagnostics/quick/ExtensionFunctions.jet b/compiler/testData/diagnostics/tests/ExtensionFunctions.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ExtensionFunctions.jet
rename to compiler/testData/diagnostics/tests/ExtensionFunctions.jet
diff --git a/compiler/testData/diagnostics/quick/ExtensionsCalledOnSuper.jet b/compiler/testData/diagnostics/tests/ExtensionsCalledOnSuper.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ExtensionsCalledOnSuper.jet
rename to compiler/testData/diagnostics/tests/ExtensionsCalledOnSuper.jet
diff --git a/compiler/testData/diagnostics/quick/ForRangeConventions.jet b/compiler/testData/diagnostics/tests/ForRangeConventions.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ForRangeConventions.jet
rename to compiler/testData/diagnostics/tests/ForRangeConventions.jet
diff --git a/compiler/testData/diagnostics/quick/FunctionCalleeExpressions.jet b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/FunctionCalleeExpressions.jet
rename to compiler/testData/diagnostics/tests/FunctionCalleeExpressions.jet
diff --git a/compiler/testData/diagnostics/quick/FunctionReturnTypes.jet b/compiler/testData/diagnostics/tests/FunctionReturnTypes.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/FunctionReturnTypes.jet
rename to compiler/testData/diagnostics/tests/FunctionReturnTypes.jet
diff --git a/compiler/testData/diagnostics/quick/GenericArgumentConsistency.jet b/compiler/testData/diagnostics/tests/GenericArgumentConsistency.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/GenericArgumentConsistency.jet
rename to compiler/testData/diagnostics/tests/GenericArgumentConsistency.jet
diff --git a/compiler/testData/diagnostics/quick/GenericFunctionIsLessSpecific.jet b/compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/GenericFunctionIsLessSpecific.jet
rename to compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.jet
diff --git a/compiler/testData/diagnostics/quick/IllegalModifiers.jet b/compiler/testData/diagnostics/tests/IllegalModifiers.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/IllegalModifiers.jet
rename to compiler/testData/diagnostics/tests/IllegalModifiers.jet
diff --git a/compiler/testData/diagnostics/quick/ImportResolutionOrder.jet b/compiler/testData/diagnostics/tests/ImportResolutionOrder.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ImportResolutionOrder.jet
rename to compiler/testData/diagnostics/tests/ImportResolutionOrder.jet
diff --git a/compiler/testData/diagnostics/quick/IncDec.jet b/compiler/testData/diagnostics/tests/IncDec.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/IncDec.jet
rename to compiler/testData/diagnostics/tests/IncDec.jet
diff --git a/compiler/testData/diagnostics/quick/IncorrectCharacterLiterals.jet b/compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/IncorrectCharacterLiterals.jet
rename to compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.jet
diff --git a/compiler/testData/diagnostics/quick/InferNullabilityInThenBlock.jet b/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/InferNullabilityInThenBlock.jet
rename to compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.jet
diff --git a/compiler/testData/diagnostics/quick/InnerClassClassObject.jet b/compiler/testData/diagnostics/tests/InnerClassClassObject.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/InnerClassClassObject.jet
rename to compiler/testData/diagnostics/tests/InnerClassClassObject.jet
diff --git a/compiler/testData/diagnostics/quick/IsExpressions.jet b/compiler/testData/diagnostics/tests/IsExpressions.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/IsExpressions.jet
rename to compiler/testData/diagnostics/tests/IsExpressions.jet
diff --git a/compiler/testData/diagnostics/quick/LValueAssignment.jet b/compiler/testData/diagnostics/tests/LValueAssignment.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/LValueAssignment.jet
rename to compiler/testData/diagnostics/tests/LValueAssignment.jet
diff --git a/compiler/testData/diagnostics/quick/MultipleBounds.jet b/compiler/testData/diagnostics/tests/MultipleBounds.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/MultipleBounds.jet
rename to compiler/testData/diagnostics/tests/MultipleBounds.jet
diff --git a/compiler/testData/diagnostics/quick/NamedArgumentsAndDefaultValues.jet b/compiler/testData/diagnostics/tests/NamedArgumentsAndDefaultValues.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/NamedArgumentsAndDefaultValues.jet
rename to compiler/testData/diagnostics/tests/NamedArgumentsAndDefaultValues.jet
diff --git a/compiler/testData/diagnostics/quick/NamespaceAsExpression.jet b/compiler/testData/diagnostics/tests/NamespaceAsExpression.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/NamespaceAsExpression.jet
rename to compiler/testData/diagnostics/tests/NamespaceAsExpression.jet
diff --git a/compiler/testData/diagnostics/quick/NamespaceInExpressionPosition.jet b/compiler/testData/diagnostics/tests/NamespaceInExpressionPosition.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/NamespaceInExpressionPosition.jet
rename to compiler/testData/diagnostics/tests/NamespaceInExpressionPosition.jet
diff --git a/compiler/testData/diagnostics/quick/NamespaceQualified.jet b/compiler/testData/diagnostics/tests/NamespaceQualified.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/NamespaceQualified.jet
rename to compiler/testData/diagnostics/tests/NamespaceQualified.jet
diff --git a/compiler/testData/diagnostics/quick/Nullability.jet b/compiler/testData/diagnostics/tests/Nullability.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Nullability.jet
rename to compiler/testData/diagnostics/tests/Nullability.jet
diff --git a/compiler/testData/diagnostics/quick/Objects.jet b/compiler/testData/diagnostics/tests/Objects.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Objects.jet
rename to compiler/testData/diagnostics/tests/Objects.jet
diff --git a/compiler/testData/diagnostics/quick/Override.jet b/compiler/testData/diagnostics/tests/Override.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Override.jet
rename to compiler/testData/diagnostics/tests/Override.jet
diff --git a/compiler/testData/diagnostics/quick/OverridingVarByVal.jet b/compiler/testData/diagnostics/tests/OverridingVarByVal.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/OverridingVarByVal.jet
rename to compiler/testData/diagnostics/tests/OverridingVarByVal.jet
diff --git a/compiler/testData/diagnostics/quick/PrimaryConstructors.jet b/compiler/testData/diagnostics/tests/PrimaryConstructors.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/PrimaryConstructors.jet
rename to compiler/testData/diagnostics/tests/PrimaryConstructors.jet
diff --git a/compiler/testData/diagnostics/quick/ProjectionOnFunctionArgumentErrror.jet b/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ProjectionOnFunctionArgumentErrror.jet
rename to compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.jet
diff --git a/compiler/testData/diagnostics/quick/ProjectionsInSupertypes.jet b/compiler/testData/diagnostics/tests/ProjectionsInSupertypes.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ProjectionsInSupertypes.jet
rename to compiler/testData/diagnostics/tests/ProjectionsInSupertypes.jet
diff --git a/compiler/testData/diagnostics/quick/Properties.jet b/compiler/testData/diagnostics/tests/Properties.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Properties.jet
rename to compiler/testData/diagnostics/tests/Properties.jet
diff --git a/compiler/testData/diagnostics/quick/QualifiedExpressions.jet b/compiler/testData/diagnostics/tests/QualifiedExpressions.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/QualifiedExpressions.jet
rename to compiler/testData/diagnostics/tests/QualifiedExpressions.jet
diff --git a/compiler/testData/diagnostics/quick/QualifiedThis.jet b/compiler/testData/diagnostics/tests/QualifiedThis.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/QualifiedThis.jet
rename to compiler/testData/diagnostics/tests/QualifiedThis.jet
diff --git a/compiler/testData/diagnostics/quick/RecursiveTypeInference.jet b/compiler/testData/diagnostics/tests/RecursiveTypeInference.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/RecursiveTypeInference.jet
rename to compiler/testData/diagnostics/tests/RecursiveTypeInference.jet
diff --git a/compiler/testData/diagnostics/quick/Redeclarations.jet b/compiler/testData/diagnostics/tests/Redeclarations.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Redeclarations.jet
rename to compiler/testData/diagnostics/tests/Redeclarations.jet
diff --git a/compiler/testData/diagnostics/quick/ResolveOfJavaGenerics.jet b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ResolveOfJavaGenerics.jet
rename to compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.jet
diff --git a/compiler/testData/diagnostics/quick/ResolveToJava.jet b/compiler/testData/diagnostics/tests/ResolveToJava.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ResolveToJava.jet
rename to compiler/testData/diagnostics/tests/ResolveToJava.jet
diff --git a/compiler/testData/diagnostics/quick/Return.jet b/compiler/testData/diagnostics/tests/Return.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Return.jet
rename to compiler/testData/diagnostics/tests/Return.jet
diff --git a/compiler/testData/diagnostics/quick/SafeCallNonNullReceiver.jet b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/SafeCallNonNullReceiver.jet
rename to compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.jet
diff --git a/compiler/testData/diagnostics/quick/SafeCallNonNullReceiverReturnNull.jet b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/SafeCallNonNullReceiverReturnNull.jet
rename to compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.jet
diff --git a/compiler/testData/diagnostics/quick/StringTemplates.jet b/compiler/testData/diagnostics/tests/StringTemplates.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/StringTemplates.jet
rename to compiler/testData/diagnostics/tests/StringTemplates.jet
diff --git a/compiler/testData/diagnostics/quick/Super.jet b/compiler/testData/diagnostics/tests/Super.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Super.jet
rename to compiler/testData/diagnostics/tests/Super.jet
diff --git a/compiler/testData/diagnostics/quick/SupertypeListChecks.jet b/compiler/testData/diagnostics/tests/SupertypeListChecks.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/SupertypeListChecks.jet
rename to compiler/testData/diagnostics/tests/SupertypeListChecks.jet
diff --git a/compiler/testData/diagnostics/quick/SyntaxErrorInTestHighlighting.jet b/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/SyntaxErrorInTestHighlighting.jet
rename to compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.jet
diff --git a/compiler/testData/diagnostics/quick/SyntaxErrorInTestHighlightingEof.jet b/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/SyntaxErrorInTestHighlightingEof.jet
rename to compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.jet
diff --git a/compiler/testData/diagnostics/quick/TraitSupertypeList.jet b/compiler/testData/diagnostics/tests/TraitSupertypeList.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/TraitSupertypeList.jet
rename to compiler/testData/diagnostics/tests/TraitSupertypeList.jet
diff --git a/compiler/testData/diagnostics/quick/TypeInference.jet b/compiler/testData/diagnostics/tests/TypeInference.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/TypeInference.jet
rename to compiler/testData/diagnostics/tests/TypeInference.jet
diff --git a/compiler/testData/diagnostics/quick/UninitializedOrReassignedVariables.jet b/compiler/testData/diagnostics/tests/UninitializedOrReassignedVariables.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/UninitializedOrReassignedVariables.jet
rename to compiler/testData/diagnostics/tests/UninitializedOrReassignedVariables.jet
diff --git a/compiler/testData/diagnostics/quick/UnitByDefaultForFunctionTypes.jet b/compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/UnitByDefaultForFunctionTypes.jet
rename to compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.jet
diff --git a/compiler/testData/diagnostics/quick/UnreachableCode.jet b/compiler/testData/diagnostics/tests/UnreachableCode.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/UnreachableCode.jet
rename to compiler/testData/diagnostics/tests/UnreachableCode.jet
diff --git a/compiler/testData/diagnostics/quick/Unresolved.jet b/compiler/testData/diagnostics/tests/Unresolved.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Unresolved.jet
rename to compiler/testData/diagnostics/tests/Unresolved.jet
diff --git a/compiler/testData/diagnostics/quick/UnusedVariables.jet b/compiler/testData/diagnostics/tests/UnusedVariables.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/UnusedVariables.jet
rename to compiler/testData/diagnostics/tests/UnusedVariables.jet
diff --git a/compiler/testData/diagnostics/quick/ValAndFunOverrideCompatibilityClash.jet b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/ValAndFunOverrideCompatibilityClash.jet
rename to compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.jet
diff --git a/compiler/testData/diagnostics/quick/VarargTypes.jet b/compiler/testData/diagnostics/tests/VarargTypes.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/VarargTypes.jet
rename to compiler/testData/diagnostics/tests/VarargTypes.jet
diff --git a/compiler/testData/diagnostics/quick/Varargs.jet b/compiler/testData/diagnostics/tests/Varargs.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Varargs.jet
rename to compiler/testData/diagnostics/tests/Varargs.jet
diff --git a/compiler/testData/diagnostics/quick/Variance.jet b/compiler/testData/diagnostics/tests/Variance.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/Variance.jet
rename to compiler/testData/diagnostics/tests/Variance.jet
diff --git a/compiler/testData/diagnostics/quick/When.jet b/compiler/testData/diagnostics/tests/When.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/When.jet
rename to compiler/testData/diagnostics/tests/When.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/CustomGetSet.jet b/compiler/testData/diagnostics/tests/backingField/CustomGetSet.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/CustomGetSet.jet
rename to compiler/testData/diagnostics/tests/backingField/CustomGetSet.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/CustomGetVal.jet b/compiler/testData/diagnostics/tests/backingField/CustomGetVal.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/CustomGetVal.jet
rename to compiler/testData/diagnostics/tests/backingField/CustomGetVal.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/CustomGetValGlobal.jet b/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/CustomGetValGlobal.jet
rename to compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/CustomGetVar.jet b/compiler/testData/diagnostics/tests/backingField/CustomGetVar.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/CustomGetVar.jet
rename to compiler/testData/diagnostics/tests/backingField/CustomGetVar.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/CustomSet.jet b/compiler/testData/diagnostics/tests/backingField/CustomSet.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/CustomSet.jet
rename to compiler/testData/diagnostics/tests/backingField/CustomSet.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/CyclicReferenceInitializer.jet b/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/CyclicReferenceInitializer.jet
rename to compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadForwardInAnonymous.jet b/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadForwardInAnonymous.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadForwardInPropertyInitializer.jet b/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadForwardInPropertyInitializer.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadInAnonymous.jet b/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadInAnonymous.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadInAnotherPropertyIntializer.jet b/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadInAnotherPropertyIntializer.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadInFunction.jet b/compiler/testData/diagnostics/tests/backingField/ReadInFunction.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadInFunction.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadInFunction.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadNonexistentAbstractPropertyInAnonymous.jet b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadNonexistentAbstractPropertyInAnonymous.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadNonexistentAbstractPropertyInFunction.jet b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadNonexistentAbstractPropertyInFunction.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadNonexistentCustomGetInAnonymous.jet b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadNonexistentCustomGetInAnonymous.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadNonexistentCustomGetInAnotherInitializer.jet b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadNonexistentCustomGetInAnotherInitializer.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadNonexistentDeclaredInHigher.jet b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadNonexistentDeclaredInHigher.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/ReadNonexistentPropertyInAnonymous.jet b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/ReadNonexistentPropertyInAnonymous.jet
rename to compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.jet
diff --git a/compiler/testData/diagnostics/quick/backingField/WriteNonexistentDeclaredInHigher.jet b/compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/backingField/WriteNonexistentDeclaredInHigher.jet
rename to compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.jet
diff --git a/compiler/testData/diagnostics/quick/cast/AsErasedError.jet b/compiler/testData/diagnostics/tests/cast/AsErasedError.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/AsErasedError.jet
rename to compiler/testData/diagnostics/tests/cast/AsErasedError.jet
diff --git a/compiler/testData/diagnostics/quick/cast/AsErasedFine.jet b/compiler/testData/diagnostics/tests/cast/AsErasedFine.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/AsErasedFine.jet
rename to compiler/testData/diagnostics/tests/cast/AsErasedFine.jet
diff --git a/compiler/testData/diagnostics/quick/cast/AsErasedStar.jet b/compiler/testData/diagnostics/tests/cast/AsErasedStar.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/AsErasedStar.jet
rename to compiler/testData/diagnostics/tests/cast/AsErasedStar.jet
diff --git a/compiler/testData/diagnostics/quick/cast/AsErasedWarning.jet b/compiler/testData/diagnostics/tests/cast/AsErasedWarning.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/AsErasedWarning.jet
rename to compiler/testData/diagnostics/tests/cast/AsErasedWarning.jet
diff --git a/compiler/testData/diagnostics/quick/cast/IsErasedAllow.jet b/compiler/testData/diagnostics/tests/cast/IsErasedAllow.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/IsErasedAllow.jet
rename to compiler/testData/diagnostics/tests/cast/IsErasedAllow.jet
diff --git a/compiler/testData/diagnostics/quick/cast/IsErasedAllowParameterSubtype.jet b/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/IsErasedAllowParameterSubtype.jet
rename to compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.jet
diff --git a/compiler/testData/diagnostics/quick/cast/IsErasedDisallowFromAny.jet b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/IsErasedDisallowFromAny.jet
rename to compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.jet
diff --git a/compiler/testData/diagnostics/quick/cast/IsErasedStar.jet b/compiler/testData/diagnostics/tests/cast/IsErasedStar.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/IsErasedStar.jet
rename to compiler/testData/diagnostics/tests/cast/IsErasedStar.jet
diff --git a/compiler/testData/diagnostics/quick/cast/IsReified.jet b/compiler/testData/diagnostics/tests/cast/IsReified.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/IsReified.jet
rename to compiler/testData/diagnostics/tests/cast/IsReified.jet
diff --git a/compiler/testData/diagnostics/quick/cast/IsTraits.jet b/compiler/testData/diagnostics/tests/cast/IsTraits.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/IsTraits.jet
rename to compiler/testData/diagnostics/tests/cast/IsTraits.jet
diff --git a/compiler/testData/diagnostics/quick/cast/WhenErasedDisallowFromAny.jet b/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/cast/WhenErasedDisallowFromAny.jet
rename to compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.jet
diff --git a/compiler/testData/diagnostics/quick/control/ForWithoutBraces.jet b/compiler/testData/diagnostics/tests/control/ForWithoutBraces.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/control/ForWithoutBraces.jet
rename to compiler/testData/diagnostics/tests/control/ForWithoutBraces.jet
diff --git a/compiler/testData/diagnostics/quick/infos/Autocasts.jet b/compiler/testData/diagnostics/tests/infos/Autocasts.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/infos/Autocasts.jet
rename to compiler/testData/diagnostics/tests/infos/Autocasts.jet
diff --git a/compiler/testData/diagnostics/quick/infos/PropertiesWithBackingFields.jet b/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/infos/PropertiesWithBackingFields.jet
rename to compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.jet
diff --git a/compiler/testData/diagnostics/quick/nullabilityAndAutoCasts/InfixCallNullability.jet b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/InfixCallNullability.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/nullabilityAndAutoCasts/InfixCallNullability.jet
rename to compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/InfixCallNullability.jet
diff --git a/compiler/testData/diagnostics/quick/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.jet b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.jet
rename to compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.jet
diff --git a/compiler/testData/diagnostics/quick/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.jet b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.jet
rename to compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.jet
diff --git a/compiler/testData/diagnostics/quick/nullabilityAndAutoCasts/ReceiverNullability.jet b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/ReceiverNullability.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/nullabilityAndAutoCasts/ReceiverNullability.jet
rename to compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/ReceiverNullability.jet
diff --git a/compiler/testData/diagnostics/quick/nullabilityAndAutoCasts/kt362.jet b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt362.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/nullabilityAndAutoCasts/kt362.jet
rename to compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt362.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/AmbiguityOnLazyTypeComputation.jet b/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/AmbiguityOnLazyTypeComputation.jet
rename to compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/AssignmentsUnderOperators.jet b/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/AssignmentsUnderOperators.jet
rename to compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/CoercionToUnit.jet b/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/CoercionToUnit.jet
rename to compiler/testData/diagnostics/tests/regressions/CoercionToUnit.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/DoubleDefine.jet b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/DoubleDefine.jet
rename to compiler/testData/diagnostics/tests/regressions/DoubleDefine.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/ErrorsOnIbjectExpressionsAsParameters.jet b/compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/ErrorsOnIbjectExpressionsAsParameters.jet
rename to compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet11.jet b/compiler/testData/diagnostics/tests/regressions/Jet11.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet11.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet11.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet121.jet b/compiler/testData/diagnostics/tests/regressions/Jet121.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet121.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet121.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet124.jet b/compiler/testData/diagnostics/tests/regressions/Jet124.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet124.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet124.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet169.jet b/compiler/testData/diagnostics/tests/regressions/Jet169.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet169.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet169.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet17.jet b/compiler/testData/diagnostics/tests/regressions/Jet17.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet17.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet17.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet183-1.jet b/compiler/testData/diagnostics/tests/regressions/Jet183-1.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet183-1.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet183-1.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet183.jet b/compiler/testData/diagnostics/tests/regressions/Jet183.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet183.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet183.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet53.jet b/compiler/testData/diagnostics/tests/regressions/Jet53.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet53.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet53.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet67.jet b/compiler/testData/diagnostics/tests/regressions/Jet67.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet67.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet67.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet68.jet b/compiler/testData/diagnostics/tests/regressions/Jet68.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet68.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet68.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet69.jet b/compiler/testData/diagnostics/tests/regressions/Jet69.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet69.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet69.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet72.jet b/compiler/testData/diagnostics/tests/regressions/Jet72.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet72.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet72.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/Jet81.jet b/compiler/testData/diagnostics/tests/regressions/Jet81.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/Jet81.jet
rename to compiler/testData/diagnostics/tests/regressions/Jet81.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/OrphanStarProjection.jet b/compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/OrphanStarProjection.jet
rename to compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/OutProjections.jet b/compiler/testData/diagnostics/tests/regressions/OutProjections.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/OutProjections.jet
rename to compiler/testData/diagnostics/tests/regressions/OutProjections.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/OverrideResolution.jet b/compiler/testData/diagnostics/tests/regressions/OverrideResolution.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/OverrideResolution.jet
rename to compiler/testData/diagnostics/tests/regressions/OverrideResolution.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/ScopeForSecondaryConstructors.jet b/compiler/testData/diagnostics/tests/regressions/ScopeForSecondaryConstructors.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/ScopeForSecondaryConstructors.jet
rename to compiler/testData/diagnostics/tests/regressions/ScopeForSecondaryConstructors.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/SpecififcityByReceiver.jet b/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/SpecififcityByReceiver.jet
rename to compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/ThisConstructorInGenericClass.jet b/compiler/testData/diagnostics/tests/regressions/ThisConstructorInGenericClass.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/ThisConstructorInGenericClass.jet
rename to compiler/testData/diagnostics/tests/regressions/ThisConstructorInGenericClass.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/UnavaliableQualifiedThis.jet b/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/UnavaliableQualifiedThis.jet
rename to compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/WrongTraceInCallResolver.jet b/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/WrongTraceInCallResolver.jet
rename to compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/control-flow-analysis/kt510.jet b/compiler/testData/diagnostics/tests/regressions/control-flow-analysis/kt510.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/control-flow-analysis/kt510.jet
rename to compiler/testData/diagnostics/tests/regressions/control-flow-analysis/kt510.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/control-flow-analysis/kt607.jet b/compiler/testData/diagnostics/tests/regressions/control-flow-analysis/kt607.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/control-flow-analysis/kt607.jet
rename to compiler/testData/diagnostics/tests/regressions/control-flow-analysis/kt607.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/control-flow-analysis/kt609.jet b/compiler/testData/diagnostics/tests/regressions/control-flow-analysis/kt609.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/control-flow-analysis/kt609.jet
rename to compiler/testData/diagnostics/tests/regressions/control-flow-analysis/kt609.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/control-flow-analysis/kt610.jet b/compiler/testData/diagnostics/tests/regressions/control-flow-analysis/kt610.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/control-flow-analysis/kt610.jet
rename to compiler/testData/diagnostics/tests/regressions/control-flow-analysis/kt610.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt127.jet b/compiler/testData/diagnostics/tests/regressions/kt127.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt127.jet
rename to compiler/testData/diagnostics/tests/regressions/kt127.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt128.jet b/compiler/testData/diagnostics/tests/regressions/kt128.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt128.jet
rename to compiler/testData/diagnostics/tests/regressions/kt128.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt174.jet b/compiler/testData/diagnostics/tests/regressions/kt174.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt174.jet
rename to compiler/testData/diagnostics/tests/regressions/kt174.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt201.jet b/compiler/testData/diagnostics/tests/regressions/kt201.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt201.jet
rename to compiler/testData/diagnostics/tests/regressions/kt201.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt235.jet b/compiler/testData/diagnostics/tests/regressions/kt235.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt235.jet
rename to compiler/testData/diagnostics/tests/regressions/kt235.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt251.jet b/compiler/testData/diagnostics/tests/regressions/kt251.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt251.jet
rename to compiler/testData/diagnostics/tests/regressions/kt251.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt258.jet b/compiler/testData/diagnostics/tests/regressions/kt258.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt258.jet
rename to compiler/testData/diagnostics/tests/regressions/kt258.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt26-1.jet b/compiler/testData/diagnostics/tests/regressions/kt26-1.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt26-1.jet
rename to compiler/testData/diagnostics/tests/regressions/kt26-1.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt26.jet b/compiler/testData/diagnostics/tests/regressions/kt26.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt26.jet
rename to compiler/testData/diagnostics/tests/regressions/kt26.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt282.jet b/compiler/testData/diagnostics/tests/regressions/kt282.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt282.jet
rename to compiler/testData/diagnostics/tests/regressions/kt282.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt287.jet b/compiler/testData/diagnostics/tests/regressions/kt287.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt287.jet
rename to compiler/testData/diagnostics/tests/regressions/kt287.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt302.jet b/compiler/testData/diagnostics/tests/regressions/kt302.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt302.jet
rename to compiler/testData/diagnostics/tests/regressions/kt302.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt303.jet b/compiler/testData/diagnostics/tests/regressions/kt303.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt303.jet
rename to compiler/testData/diagnostics/tests/regressions/kt303.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt306.jet b/compiler/testData/diagnostics/tests/regressions/kt306.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt306.jet
rename to compiler/testData/diagnostics/tests/regressions/kt306.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt307.jet b/compiler/testData/diagnostics/tests/regressions/kt307.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt307.jet
rename to compiler/testData/diagnostics/tests/regressions/kt307.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt312.jet b/compiler/testData/diagnostics/tests/regressions/kt312.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt312.jet
rename to compiler/testData/diagnostics/tests/regressions/kt312.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt313.jet b/compiler/testData/diagnostics/tests/regressions/kt313.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt313.jet
rename to compiler/testData/diagnostics/tests/regressions/kt313.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt316.jet b/compiler/testData/diagnostics/tests/regressions/kt316.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt316.jet
rename to compiler/testData/diagnostics/tests/regressions/kt316.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt328.jet b/compiler/testData/diagnostics/tests/regressions/kt328.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt328.jet
rename to compiler/testData/diagnostics/tests/regressions/kt328.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt328Complex.jet b/compiler/testData/diagnostics/tests/regressions/kt328Complex.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt328Complex.jet
rename to compiler/testData/diagnostics/tests/regressions/kt328Complex.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt328DuplicatedByKt329.jet b/compiler/testData/diagnostics/tests/regressions/kt328DuplicatedByKt329.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt328DuplicatedByKt329.jet
rename to compiler/testData/diagnostics/tests/regressions/kt328DuplicatedByKt329.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt335.336.jet b/compiler/testData/diagnostics/tests/regressions/kt335.336.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt335.336.jet
rename to compiler/testData/diagnostics/tests/regressions/kt335.336.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt337.jet b/compiler/testData/diagnostics/tests/regressions/kt337.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt337.jet
rename to compiler/testData/diagnostics/tests/regressions/kt337.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt352.jet b/compiler/testData/diagnostics/tests/regressions/kt352.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt352.jet
rename to compiler/testData/diagnostics/tests/regressions/kt352.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt353.jet b/compiler/testData/diagnostics/tests/regressions/kt353.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt353.jet
rename to compiler/testData/diagnostics/tests/regressions/kt353.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt385.109.441.jet b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt385.109.441.jet
rename to compiler/testData/diagnostics/tests/regressions/kt385.109.441.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt394.jet b/compiler/testData/diagnostics/tests/regressions/kt394.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt394.jet
rename to compiler/testData/diagnostics/tests/regressions/kt394.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt398.jet b/compiler/testData/diagnostics/tests/regressions/kt398.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt398.jet
rename to compiler/testData/diagnostics/tests/regressions/kt398.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt399.jet b/compiler/testData/diagnostics/tests/regressions/kt399.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt399.jet
rename to compiler/testData/diagnostics/tests/regressions/kt399.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt402.jet b/compiler/testData/diagnostics/tests/regressions/kt402.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt402.jet
rename to compiler/testData/diagnostics/tests/regressions/kt402.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt41.jet b/compiler/testData/diagnostics/tests/regressions/kt41.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt41.jet
rename to compiler/testData/diagnostics/tests/regressions/kt41.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt411.jet b/compiler/testData/diagnostics/tests/regressions/kt411.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt411.jet
rename to compiler/testData/diagnostics/tests/regressions/kt411.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt421Scopes.jet b/compiler/testData/diagnostics/tests/regressions/kt421Scopes.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt421Scopes.jet
rename to compiler/testData/diagnostics/tests/regressions/kt421Scopes.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt439.jet b/compiler/testData/diagnostics/tests/regressions/kt439.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt439.jet
rename to compiler/testData/diagnostics/tests/regressions/kt439.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt442.jet b/compiler/testData/diagnostics/tests/regressions/kt442.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt442.jet
rename to compiler/testData/diagnostics/tests/regressions/kt442.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt443.jet b/compiler/testData/diagnostics/tests/regressions/kt443.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt443.jet
rename to compiler/testData/diagnostics/tests/regressions/kt443.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt455.jet b/compiler/testData/diagnostics/tests/regressions/kt455.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt455.jet
rename to compiler/testData/diagnostics/tests/regressions/kt455.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt456.jet b/compiler/testData/diagnostics/tests/regressions/kt456.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt456.jet
rename to compiler/testData/diagnostics/tests/regressions/kt456.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt459.jet b/compiler/testData/diagnostics/tests/regressions/kt459.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt459.jet
rename to compiler/testData/diagnostics/tests/regressions/kt459.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt469.jet b/compiler/testData/diagnostics/tests/regressions/kt469.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt469.jet
rename to compiler/testData/diagnostics/tests/regressions/kt469.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt524.jet b/compiler/testData/diagnostics/tests/regressions/kt524.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt524.jet
rename to compiler/testData/diagnostics/tests/regressions/kt524.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt526UnresolvedReferenceInnerStatic.jet b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt526UnresolvedReferenceInnerStatic.jet
rename to compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt549.jet b/compiler/testData/diagnostics/tests/regressions/kt549.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt549.jet
rename to compiler/testData/diagnostics/tests/regressions/kt549.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt571.jet b/compiler/testData/diagnostics/tests/regressions/kt571.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt571.jet
rename to compiler/testData/diagnostics/tests/regressions/kt571.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt575.jet b/compiler/testData/diagnostics/tests/regressions/kt575.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt575.jet
rename to compiler/testData/diagnostics/tests/regressions/kt575.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt58.jet b/compiler/testData/diagnostics/tests/regressions/kt58.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt58.jet
rename to compiler/testData/diagnostics/tests/regressions/kt58.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt580.jet b/compiler/testData/diagnostics/tests/regressions/kt580.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt580.jet
rename to compiler/testData/diagnostics/tests/regressions/kt580.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt588.jet b/compiler/testData/diagnostics/tests/regressions/kt588.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt588.jet
rename to compiler/testData/diagnostics/tests/regressions/kt588.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt597.jet b/compiler/testData/diagnostics/tests/regressions/kt597.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt597.jet
rename to compiler/testData/diagnostics/tests/regressions/kt597.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt600.jet b/compiler/testData/diagnostics/tests/regressions/kt600.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt600.jet
rename to compiler/testData/diagnostics/tests/regressions/kt600.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt604.jet b/compiler/testData/diagnostics/tests/regressions/kt604.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt604.jet
rename to compiler/testData/diagnostics/tests/regressions/kt604.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt618.jet b/compiler/testData/diagnostics/tests/regressions/kt618.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt618.jet
rename to compiler/testData/diagnostics/tests/regressions/kt618.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt629.jet b/compiler/testData/diagnostics/tests/regressions/kt629.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt629.jet
rename to compiler/testData/diagnostics/tests/regressions/kt629.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt630.jet b/compiler/testData/diagnostics/tests/regressions/kt630.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt630.jet
rename to compiler/testData/diagnostics/tests/regressions/kt630.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt688.jet b/compiler/testData/diagnostics/tests/regressions/kt688.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt688.jet
rename to compiler/testData/diagnostics/tests/regressions/kt688.jet
diff --git a/compiler/testData/diagnostics/quick/regressions/kt691.jet b/compiler/testData/diagnostics/tests/regressions/kt691.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/regressions/kt691.jet
rename to compiler/testData/diagnostics/tests/regressions/kt691.jet
diff --git a/compiler/testData/diagnostics/quick/shadowing/ShadowParameterInFunctionBody.jet b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/shadowing/ShadowParameterInFunctionBody.jet
rename to compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.jet
diff --git a/compiler/testData/diagnostics/quick/shadowing/ShadowParameterInNestedBlockInFor.jet b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/shadowing/ShadowParameterInNestedBlockInFor.jet
rename to compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.jet
diff --git a/compiler/testData/diagnostics/quick/shadowing/ShadowPropertyInClosure.jet b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/shadowing/ShadowPropertyInClosure.jet
rename to compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.jet
diff --git a/compiler/testData/diagnostics/quick/shadowing/ShadowPropertyInFor.jet b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/shadowing/ShadowPropertyInFor.jet
rename to compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.jet
diff --git a/compiler/testData/diagnostics/quick/shadowing/ShadowPropertyInFunction.jet b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/shadowing/ShadowPropertyInFunction.jet
rename to compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.jet
diff --git a/compiler/testData/diagnostics/quick/shadowing/ShadowVariableInFor.jet b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/shadowing/ShadowVariableInFor.jet
rename to compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.jet
diff --git a/compiler/testData/diagnostics/quick/shadowing/ShadowVariableInNestedBlock.jet b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/shadowing/ShadowVariableInNestedBlock.jet
rename to compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.jet
diff --git a/compiler/testData/diagnostics/quick/shadowing/ShadowVariableInNestedClosure.jet b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/shadowing/ShadowVariableInNestedClosure.jet
rename to compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.jet
diff --git a/compiler/testData/diagnostics/quick/shadowing/ShadowVariableInNestedClosureParam.jet b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.jet
similarity index 100%
rename from compiler/testData/diagnostics/quick/shadowing/ShadowVariableInNestedClosureParam.jet
rename to compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.jet
diff --git a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java
index 1571a7b57d2..9befab190ad 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java
@@ -19,7 +19,7 @@ import java.util.List;
 public class CheckerTestUtilTest extends JetLiteFixture {
 
     public CheckerTestUtilTest() {
-        super("checkerWithErrorTypes/checkerTestUtil");
+        super("diagnostics/checkerTestUtil");
     }
 
     protected void doTest(TheTest theTest) throws Exception {
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
index d15bb1d2cc3..942ab311916 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
@@ -164,7 +164,7 @@ public class JetDiagnosticsTest extends JetLiteFixture {
 //    }
 
     public static Test suite() {
-        return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/checkerWithErrorTypes/quick", true, new JetTestCaseBuilder.NamedTestFactory() {
+        return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/diagnostics/tests", true, new JetTestCaseBuilder.NamedTestFactory() {
             @NotNull
             @Override
             public Test createTest(@NotNull String dataPath, @NotNull String name) {