diff --git a/modules/line_item/commerce_line_item.info b/modules/line_item/commerce_line_item.info
index 3aa5f92..30ca654 100644
--- a/modules/line_item/commerce_line_item.info
+++ b/modules/line_item/commerce_line_item.info
@@ -21,4 +21,4 @@ files[] = includes/views/handlers/commerce_line_item_handler_field_edit_quantity
 files[] = includes/views/handlers/commerce_line_item_handler_field_edit_delete.inc
 
 ; Simple tests
-; files[] = tests/commerce_line_item.test
+files[] = tests/commerce_line_item.test
diff --git a/modules/line_item/tests/commerce_line_item.test b/modules/line_item/tests/commerce_line_item.test
new file mode 100644
index 0000000..c090429
--- /dev/null
+++ b/modules/line_item/tests/commerce_line_item.test
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @file
+ * Unit tests for the Line Item module.
+ */
+
+/**
+ * Test payment user interface.
+ */
+class CommerceLineItemTest extends CommerceBaseTestCase {
+  /**
+   * Order object.
+   */
+  protected $order;
+
+  /**
+   * Implementation of getInfo().
+   */
+  public static function getInfo() {
+    return array(
+      'name' => 'Line Item',
+      'description' => 'Test the line item module',
+      'group' => 'Drupal Commerce',
+    );
+  }
+
+  /**
+   * Implementation of setUp().
+   */
+  function setUp() {
+    $modules = parent::setUpHelper('all');
+    parent::setUp($modules);
+  }
+
+  /**
+   * Simple test to check API functionality.
+   *
+   * This will check that the line_item_types() call will:
+   *  - not be null
+   *  - will be an array
+   *  - child item type's have callback name includes the line_item_type_base[base]
+   */
+  function testCommerceLineItemTypes() {
+    $line_item_types = commerce_line_item_types();
+    $this->assertNotNull($line_item_types['product'], 'commerce_line_item_types() returned the correct result');
+
+    foreach ($line_item_types as $line_item_type) {
+      $this->assertTrue(is_array($line_item_type['callbacks']), 'commerce_line_item_types() returned the correct type');
+
+      foreach ($line_item_type['callbacks'] as $callback) {
+        // Should be $line_item_type['base'] . '_' . $callback_action
+        // Ex. $callback_action: 'configuration', 'title', 'add_form',
+        // 'add_form_submit'.
+        $this->assertTrue(strpos($callback, $line_item_type['base']) !== FALSE, 'commerce_line_item_type has correct callback structure');
+      }
+    }
+  }
+
+}
diff --git a/modules/payment/commerce_payment.info b/modules/payment/commerce_payment.info
index ac799a3..3cf1bed 100644
--- a/modules/payment/commerce_payment.info
+++ b/modules/payment/commerce_payment.info
@@ -28,4 +28,4 @@ files[] = includes/views/handlers/commerce_payment_handler_field_balance.inc
 
 ; Tests
 files[] = tests/commerce_payment.rules.test
-;files[] = tests/commerce_payment.test
+files[] = tests/commerce_payment.test
diff --git a/modules/payment/tests/commerce_payment.test b/modules/payment/tests/commerce_payment.test
new file mode 100644
index 0000000..088bbf8
--- /dev/null
+++ b/modules/payment/tests/commerce_payment.test
@@ -0,0 +1,42 @@
+<?php
+/**
+ * @file
+ * Unit tests for the commerce payment module.
+ */
+
+/**
+ * Test payment user interface.
+ */
+class CommercePaymentTest extends CommerceBaseTestCase {
+  /**
+   * Order object.
+   */
+  protected $order;
+
+  /**
+   * Implementation of getInfo().
+   */
+  public static function getInfo() {
+    return array(
+      'name' => 'Payment',
+      'description' => 'Test the payment module',
+      'group' => 'Drupal Commerce',
+    );
+  }
+
+  /**
+   * Implementation of setUp().
+   */
+  function setUp() {
+    $modules = parent::setUpHelper('all');
+    parent::setUp($modules);
+  }
+
+  /**
+   * Simple test to confirm we are returning payment method titles.
+   */
+  function testCommercePaymentTitles() {
+    $payment_methods = commerce_payment_method_get_title();
+    $this->assertEqual($payment_methods['commerce_payment_example'], 'Example payment', 'commerce_payment_method_get_title() returns results');
+  }
+}