diff --git a/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/actions/AliasingOrganizeImportsTests.groovy b/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/actions/AliasingOrganizeImportsTests.groovy
index 9b41e269e7..1a057ab959 100644
--- a/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/actions/AliasingOrganizeImportsTests.groovy
+++ b/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/actions/AliasingOrganizeImportsTests.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2020 the original author or authors.
+ * Copyright 2009-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,6 +82,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E as X
             |X x
@@ -94,6 +95,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E as X
             |X.F x = null
@@ -106,6 +108,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E as X
             |X.F.G x = null
@@ -118,6 +121,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E as X
             |def x = X.F.G.H
@@ -130,6 +134,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E.F as X
             |X x = null
@@ -142,6 +147,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E.F as X
             |X.G x = null
@@ -154,6 +160,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E.F as X
             |def x = X.G.H
@@ -166,6 +173,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E.F.G as X
             |X x = null
@@ -178,6 +186,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E.F.G as X
             |def x = X.H
@@ -320,6 +329,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
             |  static getFineName() {}
             |}
             |'''
+
         String contents = '''\
             |import static p.Q.getBadName as getGoodName
             |import static p.Q.getFineName
@@ -337,6 +347,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
             |  static void setFineName(value) {}
             |}
             |'''
+
         String contents = '''\
             |import static p.Q.setBadName as setGoodName
             |import static p.Q.setFineName
@@ -354,6 +365,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
             |  static getFineName() {}
             |}
             |'''
+
         String contents = '''\
             |import static p.Q.getBadName as getGoodName
             |import static p.Q.getFineName
@@ -375,6 +387,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
             |  static void setFineName(value) {}
             |}
             |'''
+
         String contents = '''\
             |import static p.Q.setBadName as setGoodName
             |import static p.Q.setFineName
@@ -400,6 +413,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
             |  }
             |}
             |'''
+
         String contents = '''\
             |import static other.Wrapper.Feature.TopRanking as feature
             |import static other.Wrapper.Feature.values as features
@@ -416,6 +430,7 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import static a.b.c.d.E.F.G.H as X
             |def x = X
@@ -437,6 +452,24 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
         doContentsCompareTest(contents)
     }
 
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1243
+    void testRetainStaticAlias10() {
+        String contents = '''\
+            |import static p.T.f as v
+            |print v
+            |'''
+        doContentsCompareTest(contents)
+    }
+
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1243
+    void testRetainStaticAlias11() {
+        String contents = '''\
+            |import static p.T.m as f
+            |f('x')
+            |'''
+        doContentsCompareTest(contents)
+    }
+
     @Test
     void testRemoveStaticAlias1() {
         String originalContents = '''\
@@ -643,7 +676,6 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
             |  }
             |}
             |'''
-
         doContentsCompareTest(originalContents, expectedContents)
     }
 
@@ -664,7 +696,6 @@ final class AliasingOrganizeImportsTests extends OrganizeImportsTestSuite {
             |TimeUnit units = DAYS
             |units = MILLIS
             |'''
-
         doContentsCompareTest(contents)
     }
 
diff --git a/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/actions/OrganizeImportsTests.groovy b/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/actions/OrganizeImportsTests.groovy
index 6179d1cf65..672dc334c9 100644
--- a/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/actions/OrganizeImportsTests.groovy
+++ b/ide-test/org.codehaus.groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/actions/OrganizeImportsTests.groovy
@@ -463,7 +463,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport4a() {
+    void testRetainImport5() {
         // multiple generics caused type to be perceived as "ConcurrentMap<java.util.regex.Pattern,"
         String contents = '''\
             |import java.util.concurrent.ConcurrentMap
@@ -473,7 +473,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport5() {
+    void testRetainImport6() {
         String contents = '''\
             |import java.util.regex.Pattern
             |class C {
@@ -484,7 +484,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport6() {
+    void testRetainImport7() {
         String contents = '''\
             |import java.util.regex.Pattern
             |class C {
@@ -495,7 +495,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport7() {
+    void testRetainImport8() {
         String contents = '''\
             |import static java.util.regex.Pattern.compile
             |class C {
@@ -506,7 +506,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport8() {
+    void testRetainImport9() {
         String contents = '''\
             |import static java.util.regex.Pattern.compile
             |class C {
@@ -520,7 +520,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport9() {
+    void testRetainImport10() {
         String contents = '''\
             |import groovy.transform.AnnotationCollector
             |import groovy.transform.EqualsAndHashCode
@@ -534,7 +534,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport9a() {
+    void testRetainImport11() {
         String contents = '''\
             |import groovy.transform.AnnotationCollector
             |import groovy.transform.EqualsAndHashCode
@@ -550,7 +550,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport10() {
+    void testRetainImport12() {
         addJavaSource('interface I { static String NLS = "nls"; }', 'I', 'p')
 
         String contents = '''\
@@ -566,7 +566,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport11() {
+    void testRetainImport13() {
         String contents = '''\
             |import java.util.regex.Pattern
             |def parse = Pattern.&compile
@@ -575,7 +575,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport12() {
+    void testRetainImport14() {
         String contents = '''\
             |import java.util.Map.*
             |Entry entry
@@ -584,7 +584,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
     }
 
     @Test
-    void testRetainImport12a() {
+    void testRetainImport15() {
         String contents = '''\
             |import static java.util.Map.*
             |Entry entry
@@ -592,16 +592,38 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
         doContentsCompareTest(contents)
     }
 
-    @Test @NotYetImplemented
-    void testRetainImport13() {
-        createGroovyType '', 'C', '''\
-            |class C {
-            |  static m() {}
-            |}
+    @Test
+    void testRetainImport16() {
+        String contents = '''\
+            |import p.T
+            |def m(T t) {}
             |'''
+        doContentsCompareTest(contents)
+    }
+
+    @Test
+    void testRetainImport17() {
         String contents = '''\
-            |import static C.m
-            |m()
+            |import static p.T.f
+            |print f
+            |'''
+        doContentsCompareTest(contents)
+    }
+
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1243
+    void testRetainImport18() {
+        String contents = '''\
+            |import static p.T.m
+            |m('x')
+            |'''
+        doContentsCompareTest(contents)
+    }
+
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1243
+    void testRetainImport19() {
+        String contents = '''\
+            |import static p.T.m
+            |m 'x'
             |'''
         doContentsCompareTest(contents)
     }
@@ -754,6 +776,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |@interface NamedQuery {
             |}
             |'''
+
         String contents = '''\
             |@NamedQueries(
             |  @NamedQuery
@@ -773,6 +796,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |@interface NamedQuery {
             |}
             |'''
+
         String contents = '''\
             |import anns.NamedQueries
             |import anns.NamedQuery
@@ -813,6 +837,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |@interface NamedQuery {
             |}
             |'''
+
         String contents = '''\
             |import anns.NamedQueries
             |import anns.NamedQuery
@@ -832,6 +857,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |  class InnerInner { }
             |}
             |'''
+
         String contents = '''\
             |InnerInner f
             |'''
@@ -845,6 +871,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |  class InnerInner { }
             |}
             |'''
+
         String contents = '''\
             |import inner.HasInner.InnerInner
             |InnerInner f
@@ -859,6 +886,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |  class InnerInner { }
             |}
             |'''
+
         String contents = '''\
             |HasInner.InnerInner f
             |'''
@@ -872,6 +900,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |  class InnerInner { }
             |}
             |'''
+
         String contents = '''\
             |import inner.HasInner
             |HasInner.InnerInner f
@@ -887,6 +916,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |  }
             |}
             |'''
+
         String originalContents = '''\
             |import foo.Bar
             |import foo.Bar.Baz
@@ -908,6 +938,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |  }
             |}
             |'''
+
         String originalContents = '''\
             |import foo.Bar
             |import foo.Bar.Baz
@@ -925,6 +956,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E
             |E x
@@ -937,6 +969,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E.F
             |F x
@@ -949,6 +982,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import a.b.c.d.E.F.G
             |G x
@@ -961,6 +995,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { interface F { interface G { String H = 'I' } } }
             |'''
+
         String contents = '''\
             |import static a.b.c.d.E.F.G.H
             |def x = H
@@ -976,6 +1011,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |  }
             |}
             |'''
+
         String contents = '''\
             |import p.A
             |import p.A.B
@@ -1141,6 +1177,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
         createGroovyType 'a.b.c.d', 'E', '''\
             |interface E { String F = 'G.H' }
             |'''
+
         String contents = '''\
             |import static a.b.c.d.E.F
             |class Foo {
@@ -1581,6 +1618,7 @@ final class OrganizeImportsTests extends OrganizeImportsTestSuite {
             |    String name
             |}
             |'''
+
         String contents = '''
             |import groovy.transform.CompileStatic
             |
diff --git a/ide/org.codehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/refactoring/actions/OrganizeGroovyImports.java b/ide/org.codehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/refactoring/actions/OrganizeGroovyImports.java
index 5d5928ed21..2861a46ec9 100644
--- a/ide/org.codehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/refactoring/actions/OrganizeGroovyImports.java
+++ b/ide/org.codehaus.groovy.eclipse.ui/src/org/codehaus/groovy/eclipse/refactoring/actions/OrganizeGroovyImports.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2020 the original author or authors.
+ * Copyright 2009-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -555,6 +555,8 @@ public void visitMethodCallExpression(MethodCallExpression expression) {
                             staticImport += " as " + alias;
                         }
                         doNotRemoveImport(staticImport);
+                    } else if (methodTarget == null) { // unresolved type?
+                        checkRetainImport(expression.getMethodAsString());
                     }
                 } else if (isNotEmpty(expression.getGenericsTypes())) {
                     visitTypeParameters(expression.getGenericsTypes(), null);
@@ -780,10 +782,10 @@ private boolean isInnerOfSuper(String name) {
 
         private boolean checkRetainImport(String name) {
             if (!importsSlatedForRemoval.isEmpty() && !"this".equals(name) && !"super".equals(name)) {
-                String suffix = '.' + name;
                 for (Map.Entry<String, ImportNode> entry : importsSlatedForRemoval.entrySet()) {
+                    String suffix = (isAliased(entry.getValue()) ? ' ' : '.') + name;
                     if (entry.getValue().isStatic() && entry.getKey().endsWith(suffix)) {
-                        doNotRemoveImport(entry.getKey());
+                        importsSlatedForRemoval.remove(entry.getKey());
                         return true;
                     }
                 }