diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
index 3a00c1f85eb..c1fb3d10f21 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
@@ -318,7 +318,7 @@ public class DescriptorUtils {
     public static List<DeclarationDescriptor> getPathWithoutRootNsAndModule(@NotNull DeclarationDescriptor descriptor) {
         List<DeclarationDescriptor> path = Lists.newArrayList();
         DeclarationDescriptor current = descriptor;
-        for (;;) {
+        while (true) {
             if (current instanceof NamespaceDescriptor && isRootNamespace((NamespaceDescriptor) current)) {
                 return Lists.reverse(path);
             }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FqNameUnsafe.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FqNameUnsafe.java
index dc9a8d30156..ceb0222edf2 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FqNameUnsafe.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FqNameUnsafe.java
@@ -196,7 +196,7 @@ public class FqNameUnsafe {
         FqNameUnsafe last = new FqNameUnsafe(firstSegment, FqName.ROOT.toUnsafe(), firstSegment);
         callback.segment(firstSegment, last);
 
-        for (;;) {
+        while (true) {
             int next = fqName.indexOf('.', pos + 1);
             if (next < 0) {
                 if (this.parent == null) {
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java
index e7be1728e58..3ee445add52 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java
@@ -52,7 +52,7 @@ class NamespaceComparator {
             @NotNull File txtFile) {
         String serialized = new NamespaceComparator(includeObject).doCompareNamespaces(nsa, nsb);
         try {
-            for (;;) {
+            while (true) {
                 String expected = Files.toString(txtFile, Charset.forName("utf-8")).replace("\r\n", "\n");
 
                 if (expected.contains("kick me")) {
@@ -549,7 +549,7 @@ class NamespaceComparator {
         try {
             StringBuilder r = new StringBuilder();
             BufferedReader reader = new BufferedReader(new StringReader(string));
-            for (;;) {
+            while (true) {
                 String line = reader.readLine();
                 if (line == null) {
                     break;
diff --git a/examples/src/benchmarks/src/lockperf/LockPerf.java b/examples/src/benchmarks/src/lockperf/LockPerf.java
index b413bc2ad71..19a615c73ca 100644
--- a/examples/src/benchmarks/src/lockperf/LockPerf.java
+++ b/examples/src/benchmarks/src/lockperf/LockPerf.java
@@ -33,7 +33,7 @@ public class LockPerf {
             for (int i = 0; i < threadNum; ++i) {
                 new Thread(new Runnable() {
                     public void run() {
-                        for (;;) {
+                        while (true) {
                             lock.lock();
                             try {
                                 if (counter.get() == 100000000) {
diff --git a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java
index 5813ba46bf5..a084aa76076 100644
--- a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java
+++ b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java
@@ -181,7 +181,7 @@ public class JetSignatureReader {
                 start = pos;
                 visited = false;
                 inner = false;
-                for (;;) {
+                while (true) {
                     switch (c = signature.charAt(pos++)) {
                         case '.':
                         case ';':
@@ -212,7 +212,7 @@ public class JetSignatureReader {
                                 v.visitClassType(name, nullable, forceReal);
                             }
                             visited = true;
-                            top: for (;;) {
+                            top: while (true) {
                                 switch (c = signature.charAt(pos)) {
                                     case '>':
                                         break top;