diff --git a/tests/userpoints_limit.test b/tests/userpoints_limit.test
new file mode 100644
index 0000000..fcf220c
--- /dev/null
+++ b/tests/userpoints_limit.test
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @file
+ * Administration UI tests
+ */
+class UserpointsLimitAdminTestCase extends DrupalWebTestCase {
+
+  private $admin_user;
+
+  /**
+   * Implements getInfo().
+   */
+  static function getInfo() {
+    return array(
+      'name' => t('Userpoints Limit'),
+      'description' => t('Test Userpoints Limit.'),
+      'group' => t('Userpoints'),
+    );
+  }
+
+  /**
+   * Install userpoints modules, set user point limit and create users.
+   */
+  function setUp() {
+    parent::setUp('userpoints', 'userpoints_limit');
+    // Assume that the user can accrue maximum 10 points in 1 day
+    variable_set('userpoints_limit_points', 10);
+    variable_set('userpoints_limit_duration', 86400);
+
+    // Create an administrator account and log in with that.
+    $this->admin_user = $this->drupalCreateUser(array('administer userpoints'));
+    $this->drupalLogin($this->admin_user);
+  }
+
+  /**
+   * Test that admin cant add points beyond allowed user points limit.
+   */
+  function testUserPointLimit() {
+    // Try to add 11 points
+    $points = 11;
+    $edit = array(
+      'txn_user' => $this->admin_user->name,
+      'points' => $points,
+    );
+    $this->drupalPost('admin/config/people/userpoints/add', $edit, t('Save'));
+    $this->assertText(t('You may accrue a maximum of @point points during each @duration period.', array('@point' => variable_get('userpoints_limit_points', 2), '@duration' => current(drupal_map_assoc(array(variable_get('userpoints_limit_duration', 86400)), 'format_interval')))), t('Cant add user points more than allowed limit'));
+  }
+
+}
diff --git a/userpoints_limit.info b/userpoints_limit.info
index 7e8f990..47bc160 100644
--- a/userpoints_limit.info
+++ b/userpoints_limit.info
@@ -4,3 +4,4 @@ package = Userpoints
 configure = admin/config/people/userpoints/settings
 dependencies[] = userpoints
 core = 7.x
+files[] = tests/userpoints_limit.test