diff --git a/packages/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts b/packages/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts
index 9c5b198a1ea..b6737feab08 100644
--- a/packages/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts
+++ b/packages/grafana-toolkit/src/cli/templates/component.test.tsx.template.ts
@@ -1,6 +1,6 @@
 export const testTpl = `
 import React from 'react';
-import { shallow } from 'enzyme';
+import { render, screen } from '@testing-library/react';
 import { <%= name %> } from './<%= name %>';
 
 
diff --git a/packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts b/packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts
index e3cd6e90b6e..b605f755c6b 100644
--- a/packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts
+++ b/packages/grafana-toolkit/src/cli/templates/docs.mdx.template.ts
@@ -1,4 +1,4 @@
-export const docsTpl = `import { Story, Preview, Props } from '@storybook/addon-docs/blocks';
+export const docsTpl = `import { ArgsTable } from '@storybook/addon-docs/blocks';
 import { <%= name %> } from './<%= name %>';
 
 # <%= name %>
@@ -12,5 +12,5 @@ import { <%= name %> } from '@grafana/ui';
 \`\`\`
 
 ### Props
-<Props of={<%= name %>} />
+<ArgsTable of={<%= name %>} />
 `;
diff --git a/packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts b/packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts
index 56c997e6963..21c87a1f20b 100644
--- a/packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts
+++ b/packages/grafana-toolkit/src/cli/templates/story.tsx.template.ts
@@ -16,7 +16,7 @@ export default {
   },
 };
 
-export const single = () => {
+export const Basic = () => {
   return <<%= name %> />;
 };
 `;