diff --git a/public/app/features/plugins/PluginListPage.test.tsx b/public/app/features/plugins/PluginListPage.test.tsx
index 830d1176eae..452a89837c7 100644
--- a/public/app/features/plugins/PluginListPage.test.tsx
+++ b/public/app/features/plugins/PluginListPage.test.tsx
@@ -2,12 +2,13 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { PluginListPage, Props } from './PluginListPage';
 import { NavModel, Plugin } from '../../types';
+import { LayoutModes } from '../../core/components/LayoutSelector/LayoutSelector';
 
 const setup = (propOverrides?: object) => {
   const props: Props = {
     navModel: {} as NavModel,
     plugins: [] as Plugin[],
-    layoutMode: 'grid',
+    layoutMode: LayoutModes.Grid,
     loadPlugins: jest.fn(),
   };
 
diff --git a/public/app/types/index.ts b/public/app/types/index.ts
index 4ec5c6f02cc..1dd11d73564 100644
--- a/public/app/types/index.ts
+++ b/public/app/types/index.ts
@@ -6,7 +6,7 @@ import { FolderDTO, FolderState, FolderInfo } from './folders';
 import { DashboardState } from './dashboard';
 import { DashboardAcl, OrgRole, PermissionLevel } from './acl';
 import { DataSource } from './datasources';
-import { PluginMeta, Plugin, PluginInfo, PluginsState } from './plugins';
+import { PluginMeta, Plugin, PluginsState } from './plugins';
 
 export {
   Team,
@@ -33,7 +33,6 @@ export {
   PermissionLevel,
   DataSource,
   PluginMeta,
-  PluginInfo,
   Plugin,
   PluginsState,
 };
diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts
index 25c5b13153e..92bebfef8d4 100644
--- a/public/app/types/plugins.ts
+++ b/public/app/types/plugins.ts
@@ -12,20 +12,16 @@ export interface PluginInclude {
 }
 
 export interface PluginMetaInfo {
-  logos: {
-    large: string;
-    small: string;
-  };
-}
-
-export interface PluginInfo {
   author: {
     name: string;
     url: string;
   };
   description: string;
   links: string[];
-  logos: { small: string; large: string };
+  logos: {
+    large: string;
+    small: string;
+  };
   screenshots: string;
   updated: string;
   version: string;
@@ -36,7 +32,7 @@ export interface Plugin {
   enabled: boolean;
   hasUpdate: boolean;
   id: string;
-  info: PluginInfo;
+  info: PluginMetaInfo;
   latestVersion: string;
   name: string;
   pinned: boolean;