diff --git a/demo/PopoverDemo.jsx b/demo/PopoverDemo.jsx
index d38e797..fa20d47 100644
--- a/demo/PopoverDemo.jsx
+++ b/demo/PopoverDemo.jsx
@@ -6,10 +6,10 @@
  * All rights reserved.
  */
 
-const Button = require('uxcore-button');
-const React = require('react');
+import Button from 'uxcore-button';
+import React from 'react';
 
-const Popover = require('../src');
+import Popover from '../src';
 
 const test = () => {
   alert('test'); // eslint-disable-line no-alert
diff --git a/demo/index.jsx b/demo/index.jsx
index 5fce02c..0774733 100644
--- a/demo/index.jsx
+++ b/demo/index.jsx
@@ -6,9 +6,9 @@
  * All rights reserved.
  */
 
- const React = require('react');
- const ReactDOM = require('react-dom');
+ import React from 'react';
+ import ReactDOM from 'react-dom';
 
- const Demo = require('./PopoverDemo');
+ import Demo from './PopoverDemo';
 
  ReactDOM.render(<Demo />, document.getElementById('UXCoreDemo'));
diff --git a/tests/index.js b/tests/index.js
index d671a52..57d06dc 100644
--- a/tests/index.js
+++ b/tests/index.js
@@ -2,5 +2,4 @@
  * only require other specs here
  */
 
- const req = require.context('.', false, /\.spec\.js$/);
- req.keys().forEach(req);
\ No newline at end of file
+import spec from './Popover.spec';