diff --git a/packages/apollo-codegen-typescript/src/__tests__/__snapshots__/codeGeneration.ts.snap b/packages/apollo-codegen-typescript/src/__tests__/__snapshots__/codeGeneration.ts.snap
index 21a94462b9..3467cfe458 100644
--- a/packages/apollo-codegen-typescript/src/__tests__/__snapshots__/codeGeneration.ts.snap
+++ b/packages/apollo-codegen-typescript/src/__tests__/__snapshots__/codeGeneration.ts.snap
@@ -673,7 +673,7 @@ Array [
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { EnumCommentTestCase, Duplicate } from \\"./../../__generated__/globalTypes\\";
+import type { EnumCommentTestCase, Duplicate } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL mutation operation: duplicates
@@ -739,7 +739,7 @@ Array [
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { Episode } from \\"./../../__generated__/globalTypes\\";
+import type { Episode } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL query operation: HeroName
@@ -865,7 +865,7 @@ export interface humanFragment {
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { Episode } from \\"./../../__generated__/globalTypes\\";
+import type { Episode } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL fragment: droidFragment
@@ -1018,7 +1018,7 @@ export interface simpleFragment {
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { Episode } from \\"./../../__generated__/globalTypes\\";
+import type { Episode } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL fragment: anotherFragment
@@ -1149,7 +1149,7 @@ Array [
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { Episode } from \\"./../../__generated__/globalTypes\\";
+import type { Episode } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL query operation: HeroInlineFragment
@@ -1218,7 +1218,7 @@ Array [
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { Episode } from \\"./../../__generated__/globalTypes\\";
+import type { Episode } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL query operation: HeroName
@@ -1321,7 +1321,7 @@ Array [
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { Episode } from \\"./../../__generated__/globalTypes\\";
+import type { Episode } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL query operation: HeroName
@@ -1436,7 +1436,7 @@ Array [
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { EnumCommentTestCase } from \\"./../../__generated__/globalTypes\\";
+import type { EnumCommentTestCase } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL query operation: nesting
@@ -1490,7 +1490,7 @@ Array [
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { EnumCommentTestCase } from \\"./../../__generated__/globalTypes\\";
+import type { EnumCommentTestCase } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL query operation: nesting
@@ -1544,7 +1544,7 @@ Array [
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { Episode } from \\"./../../__generated__/globalTypes\\";
+import type { Episode } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL query operation: HeroFragment
@@ -1682,7 +1682,7 @@ Array [
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { Episode } from \\"./../../__generated__/globalTypes\\";
+import type { Episode } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL query operation: HeroName
@@ -1751,7 +1751,7 @@ Array [
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { Episode, ReviewInput } from \\"./../../__generated__/globalTypes\\";
+import type { Episode, ReviewInput } from \\"./../../__generated__/globalTypes\\";
 
 // ====================================================
 // GraphQL mutation operation: ReviewMovie
diff --git a/packages/apollo-codegen-typescript/src/language.ts b/packages/apollo-codegen-typescript/src/language.ts
index 81e1e0dc6a..191073fb02 100644
--- a/packages/apollo-codegen-typescript/src/language.ts
+++ b/packages/apollo-codegen-typescript/src/language.ts
@@ -167,7 +167,7 @@ export default class TypescriptGenerator {
   }
 
   public import(types: GraphQLType[], source: string) {
-    return t.importDeclaration(
+    const node = t.importDeclaration(
       types.map(type =>
         t.importSpecifier(
           t.identifier(type.toString()),
@@ -176,5 +176,11 @@ export default class TypescriptGenerator {
       ),
       t.stringLiteral(source)
     );
+    // Expect an error until `@types/babel-types` is upgraded to match the
+    // `importKind` changes made to babel:
+    // https://github.com/babel/babel/issues/9485
+    // @ts-expect-error
+    node.importKind = "type";
+    return node;
   }
 }
diff --git a/packages/apollo/src/__tests__/git.test.ts b/packages/apollo/src/__tests__/git.test.ts
index 9881e72a00..b2e9a0066d 100644
--- a/packages/apollo/src/__tests__/git.test.ts
+++ b/packages/apollo/src/__tests__/git.test.ts
@@ -11,7 +11,7 @@ describe("Git integration", () => {
     expect(info.remoteUrl).toBeDefined();
     // Match both ssh and http/s remotes
     expect(info.remoteUrl).toMatch(
-      /(https?:\/\/|git@)github.com(\/|:)apollographql\/apollo-tooling(.git)?/
+      /(https?:\/\/|git@)github.com(\/|:)(.*)\/apollo-tooling(.git)?/
     );
     expect(info.message).toBeDefined();
     expect(info.branch).toBeDefined();