diff --git a/packages/atclient/tests/test_pkam_auth.c b/packages/atclient/tests/test_pkam_auth.c
deleted file mode 100644
index bde98c8e..00000000
--- a/packages/atclient/tests/test_pkam_auth.c
+++ /dev/null
@@ -1,26 +0,0 @@
-
-static int test1_pkam_no_options();
-static int test2_pkam_with_options();
-// TODO: add apkam enrollment
-// - can't do this as a unit test until we have at_activate in C
-// static int test3_apkam_enrollment();
-
-int main() {
-  int ret = 0;
-
-  ret += test1_pkam_no_options();
-  ret += test2_pkam_with_options();
-
-  return ret;
-}
-
-static int test1_pkam_no_options() {
-  int ret = 0;
-
-  return ret;
-}
-
-static int test2_pkam_with_options() {
-  int ret = 0;
-  return ret;
-}
diff --git a/tests/functional_tests/tests/test_atclient_pkam_authenticate.c b/tests/functional_tests/tests/test_atclient_pkam_authenticate.c
new file mode 100644
index 00000000..e43881b3
--- /dev/null
+++ b/tests/functional_tests/tests/test_atclient_pkam_authenticate.c
@@ -0,0 +1,118 @@
+#include "atclient/request_options.h"
+#include "functional_tests/config.h"
+#include <atclient/atclient.h>
+#include <atclient/atclient_utils.h>
+#include <atclient/atkeys_file.h>
+#include <atclient/constants.h>
+#include <atlogger/atlogger.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static const size_t atkeyspathsize = 1024;
+static char atkeyspath[1024];
+static char *atsign;
+
+static int test1_pkam_no_options();
+static int test2_pkam_with_options();
+// TODO: add apkam enrollment
+// - can't do this as a unit test until we have at_activate in C
+// static int test3_apkam_enrollment();
+
+int main() {
+  int ret = 0;
+
+  atsign = FIRST_ATSIGN;
+
+  atlogger_set_logging_level(ATLOGGER_LOGGING_LEVEL_DEBUG);
+
+  memset(atkeyspath, 0, atkeyspathsize);
+  size_t atkeyspathlen = 0;
+
+  if ((ret = functional_tests_get_atkeys_path(atsign, strlen(atsign), atkeyspath, atkeyspathsize, &atkeyspathlen)) !=
+      0) {
+    atlogger_log("pkam_authenticate main", ATLOGGER_LOGGING_LEVEL_ERROR, "Failed to get atkeys_sharedwith path: %d\n",
+                 ret);
+    return ret;
+  }
+
+  ret += test1_pkam_no_options();
+  ret += test2_pkam_with_options();
+
+  return ret;
+}
+
+static int test1_pkam_no_options() {
+  const char *tag = "test1_pkam_no_options";
+  int ret = 0;
+
+  atclient_atkeysfile atkeys_file;
+  atclient_atkeysfile_init(&atkeys_file);
+
+  atclient_atkeys atkeys;
+  atclient_atkeys_init(&atkeys);
+
+  atclient atclient;
+  atclient_init(&atclient);
+
+  if ((ret = atclient_atkeysfile_from_path(&atkeys_file, atkeyspath)) != 0) {
+    return ret;
+  }
+  atlogger_log(tag, ATLOGGER_LOGGING_LEVEL_INFO, "atclient_atkeysfile_from_string: %d\n", ret);
+
+  if ((ret = atclient_atkeys_populate_from_atkeys_file(&atkeys, &atkeys_file)) != 0) {
+    return ret;
+  }
+  atlogger_log(tag, ATLOGGER_LOGGING_LEVEL_INFO, "atclient_atkeys_populate_from_atkeys_file: %d\n", ret);
+
+  if ((ret = atclient_pkam_authenticate(&atclient, atsign, &atkeys, NULL)) != 0) {
+    atlogger_log(tag, ATLOGGER_LOGGING_LEVEL_ERROR, "Failed to authenticate\n");
+    return ret;
+  } else {
+    atlogger_log(tag, ATLOGGER_LOGGING_LEVEL_DEBUG, "Authenticated\n");
+  }
+
+  return ret;
+}
+
+static int test2_pkam_with_options() {
+  const char *tag = "test2_pkam_with_options";
+  int ret = 0;
+
+  atclient_atkeysfile atkeys_file;
+  atclient_atkeysfile_init(&atkeys_file);
+
+  atclient_atkeys atkeys;
+  atclient_atkeys_init(&atkeys);
+
+  atclient atclient;
+  atclient_init(&atclient);
+
+  if ((ret = atclient_atkeysfile_from_path(&atkeys_file, atkeyspath)) != 0) {
+    return ret;
+  }
+  atlogger_log(tag, ATLOGGER_LOGGING_LEVEL_INFO, "atclient_atkeysfile_from_string: %d\n", ret);
+
+  if ((ret = atclient_atkeys_populate_from_atkeys_file(&atkeys, &atkeys_file)) != 0) {
+    return ret;
+  }
+  atlogger_log(tag, ATLOGGER_LOGGING_LEVEL_INFO, "atclient_atkeys_populate_from_atkeys_file: %d\n", ret);
+
+  atclient_pkam_authenticate_options options;
+  atclient_pkam_authenticate_options_init(&options);
+
+  if ((ret = atclient_utils_find_atserver_address(ATCLIENT_ATDIRECTORY_PRODUCTION_HOST,
+                                                  ATCLIENT_ATDIRECTORY_PRODUCTION_PORT, atsign, &options.atserver_host,
+                                                  &options.atserver_port)) != 0) {
+    atlogger_log(tag, ATLOGGER_LOGGING_LEVEL_ERROR, "atclient_utils_find_atserver_address: %d\n", ret);
+    return ret;
+  }
+
+  if ((ret = atclient_pkam_authenticate(&atclient, atsign, &atkeys, NULL)) != 0) {
+    atlogger_log(tag, ATLOGGER_LOGGING_LEVEL_ERROR, "Failed to authenticate\n");
+    return ret;
+  } else {
+    atlogger_log(tag, ATLOGGER_LOGGING_LEVEL_DEBUG, "Authenticated\n");
+  }
+  return ret;
+}