diff --git a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
index 3fbdd4f186f..a586891775c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
@@ -401,7 +401,7 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
         }
 
         public void renderClassDescriptor(ClassDescriptor descriptor, StringBuilder builder, String keyword) {
-            if (descriptor.getKind() != ClassKind.TRAIT) {
+            if (descriptor.getKind() != ClassKind.TRAIT && descriptor.getKind() != ClassKind.OBJECT) {
                 renderModality(descriptor.getModality(), builder);
             }
             builder.append(renderKeyword(keyword));
diff --git a/idea/testData/libraries/Color.kt b/idea/testData/libraries/Color.kt
index 1e5516ba4ea..a23bb9d367d 100644
--- a/idea/testData/libraries/Color.kt
+++ b/idea/testData/libraries/Color.kt
@@ -3,6 +3,6 @@
 
 package testData.libraries
 
-[class Color {
-    [val rgb : jet.Int] /* compiled code */
+[final class Color {
+    [final val rgb : jet.Int] /* compiled code */
 }]
diff --git a/idea/testData/libraries/SimpleClass.kt b/idea/testData/libraries/SimpleClass.kt
index 60528a70a69..7f9387af5d4 100644
--- a/idea/testData/libraries/SimpleClass.kt
+++ b/idea/testData/libraries/SimpleClass.kt
@@ -3,5 +3,5 @@
 
 package testData.libraries
 
-[class SimpleClass {
+[final class SimpleClass {
 }]
diff --git a/idea/testData/libraries/SimpleTraitImpl.kt b/idea/testData/libraries/SimpleTraitImpl.kt
index 8c4007af99f..5c964d00853 100644
--- a/idea/testData/libraries/SimpleTraitImpl.kt
+++ b/idea/testData/libraries/SimpleTraitImpl.kt
@@ -3,5 +3,5 @@
 
 package testData.libraries
 
-[class SimpleTraitImpl : testData.libraries.SimpleTrait {
+[final class SimpleTraitImpl : testData.libraries.SimpleTrait {
 }]
diff --git a/idea/testData/libraries/WithInnerAndObject.kt b/idea/testData/libraries/WithInnerAndObject.kt
index 4d788cd595e..846cc2fc097 100644
--- a/idea/testData/libraries/WithInnerAndObject.kt
+++ b/idea/testData/libraries/WithInnerAndObject.kt
@@ -3,12 +3,12 @@
 
 package testData.libraries
 
-[class WithInnerAndObject {
+[final class WithInnerAndObject {
     class object {
-        [fun foo() : Unit { /* compiled code */ }]
+        [final fun foo() : Unit { /* compiled code */ }]
     }
 
-    [class MyInner {
+    [final class MyInner {
         [trait MyInnerInner {
             [abstract fun innerInnerMethod() : Unit]
         }]
diff --git a/idea/testData/libraries/WithTraitClassObject.kt b/idea/testData/libraries/WithTraitClassObject.kt
index 4529fc325bc..d9189c8dce2 100644
--- a/idea/testData/libraries/WithTraitClassObject.kt
+++ b/idea/testData/libraries/WithTraitClassObject.kt
@@ -3,7 +3,7 @@
 
 package testData.libraries
 
-[class WithTraitClassObject {
+[final class WithTraitClassObject {
     class object : testData.libraries.SimpleTrait {
     }
 }]
diff --git a/idea/testData/libraries/namespace.kt b/idea/testData/libraries/namespace.kt
index 269bc0edb06..b75381b9408 100644
--- a/idea/testData/libraries/namespace.kt
+++ b/idea/testData/libraries/namespace.kt
@@ -3,8 +3,8 @@
 
 package testData.libraries
 
-[fun main(val args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
+[final fun main(val args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
 
-[val globalVal : #(jet.Int, jet.String)] /* compiled code */
+[final val globalVal : #(jet.Int, jet.String)] /* compiled code */
 
-[val globalValWithGetter : jet.Long] /* compiled code */
+[final val globalValWithGetter : jet.Long] /* compiled code */