diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
index 225f67782..3a3360bed 100644
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
@@ -46,6 +46,7 @@
 #if USE_GLOG_AND_GFLAGS
 #include <glog/logging.h>
 #else
+#include <absl/log/check.h>
 #include <absl/log/log.h>
 #endif
 
@@ -94,7 +95,11 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(const ConfigurationInterface *con
       enable_dynamic_bit_selection_(configuration->property(role + ".enable_dynamic_bit_selection", true)),
       enable_ovf_check_buffer_monitor_active_(false),
       dump_(configuration->property(role + ".dump", false)),
+#if USE_GLOG_AND_GFLAGS
       rf_shutdown_(configuration->property(role + ".rf_shutdown", FLAGS_rf_shutdown)),
+#else
+      rf_shutdown_(configuration->property(role + ".rf_shutdown", absl::GetFlag(FLAGS_rf_shutdown))),
+#endif
       repeat_(configuration->property(role + ".repeat", false))
 {
     const double seconds_to_skip = configuration->property(role + ".seconds_to_skip", 0.0);
@@ -121,7 +126,7 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(const ConfigurationInterface *con
         {
             filter_source_ = configuration->property(role + ".filter_source", std::string("Off"));
         }
-
+#if USE_GLOG_AND_GFLAGS
     // override value with commandline flag, if present
     if (FLAGS_signal_source != "-")
         {
@@ -131,7 +136,16 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(const ConfigurationInterface *con
         {
             filename0_ = FLAGS_s;
         }
-
+#else
+    if (absl::GetFlag(FLAGS_signal_source) != "-")
+        {
+            filename0_ = absl::GetFlag(FLAGS_signal_source);
+        }
+    if (absl::GetFlag(FLAGS_s) != "-")
+        {
+            filename0_ = absl::GetFlag(FLAGS_s);
+        }
+#endif
     if (filename0_.empty())
         {
             num_input_files_ = 2;
diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc
index 1bd15ce35..e2a516a36 100644
--- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.cc
@@ -75,7 +75,11 @@ Fmcomms2SignalSource::Fmcomms2SignalSource(const ConfigurationInterface *configu
       rf_dc_(configuration->property(role + ".rf_dc", true)),
       bb_dc_(configuration->property(role + ".bb_dc", true)),
       filter_auto_(configuration->property(role + ".filter_auto", false)),
+#if USE_GLOG_AND_GFLAGS
       rf_shutdown_(configuration->property(role + ".rf_shutdown", FLAGS_rf_shutdown)),
+#else
+      rf_shutdown_(configuration->property(role + ".rf_shutdown", absl::GetFlag(FLAGS_rf_shutdown))),
+#endif
       dump_(configuration->property(role + ".dump", false))
 {
     if (filter_auto_)
diff --git a/src/tests/common-files/test_flags.h b/src/tests/common-files/test_flags.h
index 937ad4418..57061e5a7 100644
--- a/src/tests/common-files/test_flags.h
+++ b/src/tests/common-files/test_flags.h
@@ -34,7 +34,7 @@ DEFINE_int32(plot_decimate, 1, "Decimate plots");
 #else
 #include <absl/flags/flag.h>
 #if defined GNUPLOT_EXECUTABLE
-ABSL_FLAG(std::string, std::string(GNUPLOT_EXECUTABLE), "Gnuplot binary path");
+ABSL_FLAG(std::string, gnuplot_executable, std::string(GNUPLOT_EXECUTABLE), "Gnuplot binary path");
 #elif !defined GNUPLOT_EXECUTABLE
 ABSL_FLAG(std::string, gnuplot_executable, "", "Gnuplot binary path");
 #endif